6
6
#
7
7
# ###############################################################################
8
8
9
- VERSION=" 2.4.1 "
9
+ VERSION=" 2.5.0 "
10
10
11
11
# ###############################################################################
12
12
# Common
@@ -57,24 +57,6 @@ get_platform()
57
57
esac
58
58
}
59
59
60
- get_qemu ()
61
- {
62
- local arch=" $1 "
63
- local qemu=" "
64
- local host_platform=$( get_platform)
65
- local guest_platform=$( get_platform " ${arch} " )
66
- if [ " ${host_platform} " != " ${guest_platform} " ]; then
67
- case " ${guest_platform} " in
68
- arm) qemu=" qemu-arm-static" ;;
69
- arm_64) qemu=" qemu-aarch64-static" ;;
70
- x86) qemu=" qemu-i386-static" ;;
71
- x86_64) qemu=" qemu-x86_64-static" ;;
72
- * ) qemu=" " ;;
73
- esac
74
- fi
75
- echo ${qemu}
76
- }
77
-
78
60
get_uuid ()
79
61
{
80
62
cat /proc/sys/kernel/random/uuid
@@ -241,9 +223,6 @@ chroot_exec()
241
223
mounts=" ${mounts} -b ${MOUNTS// / -b } "
242
224
fi
243
225
local emulator
244
- if [ -z " ${EMULATOR} " ]; then
245
- EMULATOR=$( get_qemu ${ARCH} )
246
- fi
247
226
if [ -n " ${EMULATOR} " ]; then
248
227
emulator=" -q ${EMULATOR} "
249
228
fi
@@ -260,16 +239,6 @@ chroot_exec()
260
239
esac
261
240
}
262
241
263
- sync_env ()
264
- {
265
- local env_url=" $1 "
266
- [ -n " ${env_url} " ] || return 1
267
- msg -n " Synchronization with server ... "
268
- [ -e " ${ENV_DIR} " ] || mkdir -p " ${ENV_DIR} "
269
- wget -q -O - " ${env_url} " | tar xz -C " ${ENV_DIR} " 1>&2
270
- is_ok " fail" " done"
271
- }
272
-
273
242
# ###############################################################################
274
243
# Params
275
244
# ###############################################################################
@@ -944,8 +913,6 @@ container_status()
944
913
local supported_fs=$( printf ' %s ' $( grep -v nodev /proc/filesystems | sort) )
945
914
msg " ${supported_fs} "
946
915
947
- [ -n " ${CHROOT_DIR} " ] || return 0
948
-
949
916
msg -n " Installed system: "
950
917
local linux_version=$( [ -r " ${CHROOT_DIR} /etc/os-release" ] && . " ${CHROOT_DIR} /etc/os-release" ; [ -n " ${PRETTY_NAME} " ] && echo " ${PRETTY_NAME} " || echo " unknown" )
951
918
msg " ${linux_version} "
@@ -955,53 +922,11 @@ container_status()
955
922
component_exec " ${INCLUDE} "
956
923
957
924
msg " Mounted parts: "
958
- local is_mnt=0
959
925
local item
960
926
for item in $( grep " ${CHROOT_DIR%/ } " /proc/mounts | awk ' {print $2}' | sed " s|${CHROOT_DIR%/ } /*|/|g" )
961
927
do
962
928
msg " * ${item} "
963
- local is_mnt=1
964
- done
965
- [ " ${is_mnt} " -ne 1 ] && msg " ...nothing mounted"
966
-
967
- msg " Available mount points: "
968
- local is_mountpoints=0
969
- local mp
970
- for mp in $( grep -v " ${CHROOT_DIR%/ } " /proc/mounts | grep ^/ | awk ' {print $2":"$3}' )
971
- do
972
- local part=$( echo ${mp} | awk -F: ' {print $1}' )
973
- local fstype=$( echo ${mp} | awk -F: ' {print $2}' )
974
- local block_size=$( stat -c ' %s' -f ${part} )
975
- local available=$( stat -c ' %a' -f ${part} | awk ' {printf("%.1f",$1*' ${block_size} ' /1024/1024/1024)}' )
976
- local total=$( stat -c ' %b' -f ${part} | awk ' {printf("%.1f",$1*' ${block_size} ' /1024/1024/1024)}' )
977
- if [ -n " ${available} " -a -n " ${total} " ]; then
978
- msg " * ${part} ${available} /${total} GB (${fstype} )"
979
- is_mountpoints=1
980
- fi
981
- done
982
- [ " ${is_mountpoints} " -ne 1 ] && msg " ...no mount points"
983
-
984
- msg " Available partitions: "
985
- local is_partitions=0
986
- local dev
987
- for dev in /sys/block/* /dev
988
- do
989
- if [ -f ${dev} ]; then
990
- local devname=$( echo ${dev} | sed -e ' s@/dev@@' -e ' s@.*/@@' )
991
- [ -e " /dev/${devname} " ] && local devpath=" /dev/${devname} "
992
- [ -e " /dev/block/${devname} " ] && local devpath=" /dev/block/${devname} "
993
- [ -n " ${devpath} " ] && local parts=$( fdisk -l ${devpath} 2> /dev/null | grep ^/dev/ | awk ' {print $1}' )
994
- local part
995
- for part in ${parts}
996
- do
997
- local size=$( fdisk -l ${part} 2> /dev/null | grep ' Disk.*bytes' | awk ' { sub(/,/,""); print $3" "$4}' )
998
- local type=$( fdisk -l ${devpath} 2> /dev/null | grep ^${part} | tr -d ' *' | awk ' {str=$6; for (i=7;i<=10;i++) if ($i!="") str=str" "$i; printf("%s",str)}' )
999
- msg " * ${part} ${size} (${type} )"
1000
- local is_partitions=1
1001
- done
1002
- fi
1003
929
done
1004
- [ " ${is_partitions} " -ne 1 ] && msg " ...no available partitions"
1005
930
}
1006
931
1007
932
helper ()
@@ -1041,7 +966,6 @@ COMMANDS:
1041
966
-m - mount the container before start
1042
967
stop [-u] [NAME ...] - stop all included or only specified components
1043
968
-u - unmount the container after stop
1044
- sync URL - synchronize with the operating environment with server
1045
969
status [NAME ...] - display the status of the container and components
1046
970
help [NAME ...] - show this help or help of components
1047
971
1086
1010
if [ -z " ${CHROOT_DIR} " ]; then
1087
1011
CHROOT_DIR=" ${ENV_DIR} /mnt"
1088
1012
fi
1013
+ if [ -z " ${METHOD} " ]; then
1014
+ METHOD=" chroot"
1015
+ fi
1089
1016
1090
1017
# parse options
1091
1018
OPTIND=1
@@ -1133,14 +1060,6 @@ WITHOUT_CHECK="false"
1133
1060
WITHOUT_DEPENDS=" false"
1134
1061
REVERSE_DEPENDS=" false"
1135
1062
EXCLUDE_COMPONENTS=" "
1136
- case " ${METHOD} " in
1137
- proot)
1138
- CHROOT_DIR=" ${TARGET_PATH} "
1139
- ;;
1140
- * )
1141
- METHOD=" chroot"
1142
- ;;
1143
- esac
1144
1063
1145
1064
# make dirs
1146
1065
[ -d " ${CONFIG_DIR} " ] || mkdir " ${CONFIG_DIR} "
@@ -1314,9 +1233,6 @@ stop)
1314
1233
container_umount
1315
1234
fi
1316
1235
;;
1317
- sync)
1318
- sync_env " $@ "
1319
- ;;
1320
1236
status)
1321
1237
if [ $# -gt 0 ]; then
1322
1238
DO_ACTION=' do_status'
0 commit comments