X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=deed894fea40be15c82e470580444f3504fce9de;hb=4fbda6a580ea77c11a507c1c45f1bceed3653722;hp=925b34fbcd03845257f579ed75212a7b128b36a2;hpb=54dca8e1902c0329b2a070098ea93b001a22cc5b;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 925b34f..deed894 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -24,7 +24,6 @@ declare -a CHBIND_OPTS=() declare -a CAP_OPTS=() declare -a CHCONTEXT_INIT_OPTS=() declare -a CHCONTEXT_FLAG_OPTS=() -declare -a CHCONTEXT_DISCONNECT=() declare -a CHCONTEXT_OPTS=() declare -a CAPCHROOT_OPTS=() declare -a INTERFACES=() @@ -38,54 +37,41 @@ declare -a INITKILL_SEQ=() declare -a ENTER_SHELL=() INTERFACE_CMDS_IDX=0 +_HAVE_INTERFACE_OPTIONS= +_HAVE_CHBIND_OPTIONS= INITSTYLE=sysv S_CONTEXT= SILENT_OPT= -_NEWLINE=' -' -_NEWLINE=${_NEWLINE:0-1} : ${VSERVER_NAME:=$(basename "$VSERVER_DIR")} -if test -e "$VSERVER_DIR"/noisy; then +if test -e "$VSERVER_DIR"/noisy -o "$OPTION_VERBOSE"; then SILENT_OPT= else SILENT_OPT='--silent' fi -## Called as '_getFileValue ' -function _getFileValue -{ - test -r "$2" || return 0 - eval read "$1" <"$2" -} - -## Called as '_getFileArray ' -function _getFileArray -{ - test -r "$2" || return 0 - - local IFS=$_NEWLINE - eval "$1"='( $(< "$2") )' -} - function _generateChbindOptions { local vdir="$1" local i local bcast= + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" + local f=$vdir/interfaces/bcast - _getFileValue bcast "$f" + getFileValue bcast "$f" CHBIND_OPTS=( $SILENT_OPT ${bcast:+--bcast "$bcast"} ) for i in "${INTERFACES[@]}"; do CHBIND_OPTS=( "${CHBIND_OPTS[@]}" --ip "$i" ) done + + _HAVE_CHBIND_OPTIONS=1 } function _generateNiceCommand @@ -128,7 +114,7 @@ function getEnterShell ENTER_SHELL=() - _getFileValue ENTER_SHELL "$vdir"/shell + getFileValue ENTER_SHELL "$vdir"/shell test "$ENTER_SHELL" || { local i @@ -159,11 +145,11 @@ function _generateInitOptions CHCONTEXT_INIT_OPTS=() - _getFileValue INITSTYLE "$cfgdir"/style - _getFileValue runlevel_start "$cfgdir"/runlevel - _getFileValue runlevel_start "$cfgdir"/runlevel.start - _getFileValue runlevel_stop "$cfgdir"/runlevel.stop - _getFileArray INITKILL_SEQ "$cfgdir"/killseq + getFileValue INITSTYLE "$cfgdir"/style + getFileValue runlevel_start "$cfgdir"/runlevel + getFileValue runlevel_start "$cfgdir"/runlevel.start + getFileValue runlevel_stop "$cfgdir"/runlevel.stop + getFileArray INITKILL_SEQ "$cfgdir"/killseq case x"$INITSTYLE" in xsysv) @@ -181,8 +167,7 @@ function _generateInitOptions xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; @@ -190,8 +175,7 @@ function _generateInitOptions xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) @@ -203,11 +187,11 @@ function _generateInitOptions exit 1;; esac - _getFileArray INITCMD_START "$cfgdir"/cmd.start - _getFileArray INITCMD_STOP "$cfgdir"/cmd.stop - _getFileArray INITCMD_START_SYNC "$cfgdir"/cmd.start-sync - _getFileArray INITCMD_STOP_SYNC "$cfgdir"/cmd.stop-sync - _getFileArray INITCMD_PREPARE "$cfgdir"/cmd.prepare + getFileArray INITCMD_START "$cfgdir"/cmd.start + getFileArray INITCMD_STOP "$cfgdir"/cmd.stop + getFileArray INITCMD_START_SYNC "$cfgdir"/cmd.start-sync + getFileArray INITCMD_STOP_SYNC "$cfgdir"/cmd.stop-sync + getFileArray INITCMD_PREPARE "$cfgdir"/cmd.prepare test -e "$cfgdir"/sync -o "$OPTION_FORCE_SYNC" || { @@ -229,8 +213,7 @@ function _generateFlagOptions x|x#) ;; dummy) ;; fakeinit) - CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) ;; *) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" @@ -248,9 +231,9 @@ function _generateChcontextOptions local flag { - read ctx <"$vdir"/context - read hostname <"$vdir"/hostname - read domainname <"$vdir"/domainname + read ctx <"$vdir"/context || : + read hostname <"$vdir"/hostname || : + read domainname <"$vdir"/domainname || : } 2>/dev/null test -z "$S_CONTEXT" || ctx=$S_CONTEXT @@ -260,7 +243,6 @@ function _generateChcontextOptions CHCONTEXT_OPTS=( $SILENT_OPT \ "${CHCONTEXT_FLAG_OPTS[@]}" \ - "${CHCONTEXT_INIT_OPTS[@]}" \ "${CAP_OPTS[@]}" \ --secure ${ctx:+--ctx "$ctx"} \ @@ -364,6 +346,7 @@ function _generateInterfaceOptions _processSingleInterface "$iface" done + _HAVE_INTERFACE_OPTIONS=1 } function enableInterfaces @@ -390,11 +373,13 @@ function enableInterfaces function disableInterfaces { + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" + local i=$INTERFACE_CMDS_IDX declare -a var while test $i -gt 0; do - let --i + let --i || : eval var='( "${INTERFACE_CMDS_'$i'[@]}" )' local type=${var[0]} @@ -429,7 +414,7 @@ function prepareInit function generateOptions { _generateInterfaceOptions "$1" - _generateChbindOptions "$1" + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" @@ -443,12 +428,13 @@ function mountVserver test -e "$cfgdir"/fstab || return 0 - findObject -r mtab_src "$CONFDIR"/.defaults/init/mtab "$vdir"/apps/init/mtab /dev/null + findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab /dev/null pushd "$vdir" >/dev/null $_CHROOT_CAT /etc/mtab <"$mtab_src" popd >/dev/null + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab } @@ -461,6 +447,7 @@ function umountVserver is_ok=1 test -e "$cfgdir"/fstab || return 0 + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" pushd "$vdir/" >/dev/null tac "$cfgdir"/fstab | while read src dst tmp; do @@ -469,8 +456,8 @@ function umountVserver x#*) continue;; esac - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_UMOUNT "$dst" || is_ok= + $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \ + $_UMOUNT -lfn . || is_ok= done popd >/dev/null