X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=d666cbccef161f6573f73839dc2a5e12e9e00184;hb=ab198dcb10b2c6b0e445a59af00dc292207454f3;hp=9e92c98c37bd68d0b3b666162a2f0979aba17cfd;hpb=ee4ffc22ce762e4fde1ee458cbcd52132667e7d8;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 9e92c98..d666cbc 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -99,8 +99,8 @@ function _generateCCapabilityOptions test -e "$f" || return 0 while read cap; do case x"$cap" in - x|x#) ;; - *) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );; + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );; esac done <"$f" } @@ -114,8 +114,8 @@ function _generateBCapabilityOptions test -e "$f" || return 0 while read cap; do case x"$cap" in - x|x#) ;; - *) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );; + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );; esac done <"$f" } @@ -125,6 +125,9 @@ function _generateCapabilityOptions local vdir=$1 local cap + _generateBCapabilityOptions "$vdir" + _generateCCapabilityOptions "$vdir" + test -e "$vdir"/capabilities || return 0 CAP_OPTS=() @@ -132,15 +135,14 @@ function _generateCapabilityOptions while read cap; do case x"$cap" in - x|x#) ;; - !CAP_SYSCHROOT) - OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]" --cap "$cap" ) + (x|x\#) ;; + (!CAP_SYSCHROOT) CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" ) CAPCHROOT_OPTS=( "${CAPCHROOT_OPTS[@]}" --nochroot ) ;; - *) - OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]" --cap "$cap" ) - CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" );; + (*) + CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" ) + ;; esac done <"$vdir"/capabilities } @@ -206,7 +208,7 @@ function _generateInitOptions getFileArray INITKILL_SEQ "$cfgdir"/killseq case x"$INITSTYLE" in - xsysv) + (xsysv) test "$runlevel_start" || runlevel_start=3 test "$runlevel_stop" || runlevel_stop=6 @@ -218,7 +220,7 @@ function _generateInitOptions INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$runlevel_start" /var/run/utmp ) ;; - xplain) + (xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) @@ -227,7 +229,7 @@ function _generateInitOptions test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; - xminit) + (xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) @@ -238,8 +240,8 @@ function _generateInitOptions test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; - x) ;; - *) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; + (x) ;; + (*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; exit 1;; esac @@ -266,13 +268,13 @@ function _generateFlagOptions while read flag; do case x"$flag" in - x|x#) ;; - xnamespace) ;; - xfakeinit) + (x|x\#) ;; + (xnamespace) ;; + (xfakeinit) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) ;; - *) + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" ) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag "$flag" ) @@ -387,7 +389,7 @@ function _processSingleInterface _transformMask2Prefix prefix "$prefix" "$mask" case "$dev" in - *.*) + (*.*) test -d /proc/net/vlan || { echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers" >&2 return 1 @@ -526,7 +528,7 @@ function umountVserver is_ok=1 - isAvoidNamespace "$cfgdir" || return 0 + isAvoidNamespace "$cfgdir" || return 0 test -e "$cfgdir"/fstab || return 0 test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" @@ -534,7 +536,7 @@ function umountVserver tac "$cfgdir"/fstab | while read src dst tmp; do test "$tmp" || continue case x"$src" in - x#*) continue;; + (x\#*) continue;; esac $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \