66#
77# ###############################################################################
88
9- VERSION=" 2.4.1 "
9+ VERSION=" 2.5.0 "
1010
1111# ###############################################################################
1212# Common
@@ -57,24 +57,6 @@ get_platform()
5757 esac
5858}
5959
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-
7860get_uuid ()
7961{
8062 cat /proc/sys/kernel/random/uuid
@@ -241,9 +223,6 @@ chroot_exec()
241223 mounts=" ${mounts} -b ${MOUNTS// / -b } "
242224 fi
243225 local emulator
244- if [ -z " ${EMULATOR} " ]; then
245- EMULATOR=$( get_qemu ${ARCH} )
246- fi
247226 if [ -n " ${EMULATOR} " ]; then
248227 emulator=" -q ${EMULATOR} "
249228 fi
@@ -260,16 +239,6 @@ chroot_exec()
260239 esac
261240}
262241
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-
273242# ###############################################################################
274243# Params
275244# ###############################################################################
@@ -944,8 +913,6 @@ container_status()
944913 local supported_fs=$( printf ' %s ' $( grep -v nodev /proc/filesystems | sort) )
945914 msg " ${supported_fs} "
946915
947- [ -n " ${CHROOT_DIR} " ] || return 0
948-
949916 msg -n " Installed system: "
950917 local linux_version=$( [ -r " ${CHROOT_DIR} /etc/os-release" ] && . " ${CHROOT_DIR} /etc/os-release" ; [ -n " ${PRETTY_NAME} " ] && echo " ${PRETTY_NAME} " || echo " unknown" )
951918 msg " ${linux_version} "
@@ -955,53 +922,11 @@ container_status()
955922 component_exec " ${INCLUDE} "
956923
957924 msg " Mounted parts: "
958- local is_mnt=0
959925 local item
960926 for item in $( grep " ${CHROOT_DIR%/ } " /proc/mounts | awk ' {print $2}' | sed " s|${CHROOT_DIR%/ } /*|/|g" )
961927 do
962928 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
1003929 done
1004- [ " ${is_partitions} " -ne 1 ] && msg " ...no available partitions"
1005930}
1006931
1007932helper ()
@@ -1041,7 +966,6 @@ COMMANDS:
1041966 -m - mount the container before start
1042967 stop [-u] [NAME ...] - stop all included or only specified components
1043968 -u - unmount the container after stop
1044- sync URL - synchronize with the operating environment with server
1045969 status [NAME ...] - display the status of the container and components
1046970 help [NAME ...] - show this help or help of components
1047971
10861010if [ -z " ${CHROOT_DIR} " ]; then
10871011 CHROOT_DIR=" ${ENV_DIR} /mnt"
10881012fi
1013+ if [ -z " ${METHOD} " ]; then
1014+ METHOD=" chroot"
1015+ fi
10891016
10901017# parse options
10911018OPTIND=1
@@ -1133,14 +1060,6 @@ WITHOUT_CHECK="false"
11331060WITHOUT_DEPENDS=" false"
11341061REVERSE_DEPENDS=" false"
11351062EXCLUDE_COMPONENTS=" "
1136- case " ${METHOD} " in
1137- proot)
1138- CHROOT_DIR=" ${TARGET_PATH} "
1139- ;;
1140- * )
1141- METHOD=" chroot"
1142- ;;
1143- esac
11441063
11451064# make dirs
11461065[ -d " ${CONFIG_DIR} " ] || mkdir " ${CONFIG_DIR} "
@@ -1314,9 +1233,6 @@ stop)
13141233 container_umount
13151234 fi
13161235;;
1317- sync)
1318- sync_env " $@ "
1319- ;;
13201236status)
13211237 if [ $# -gt 0 ]; then
13221238 DO_ACTION=' do_status'
0 commit comments