X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=83215c9f0eadbb2c848721b77f2b7b4c90abc3f2;hb=b30f4928376b71bd44021a951115e848e925d198;hp=86fc57a3c4984e965fe63d29e67388918fdea185;hpb=8bfd7aa539e4c56756e2226b1ef66524bb89e03e;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 86fc57a..83215c9 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -90,11 +90,44 @@ function _generateNiceCommand NICE_CMD=( $_NICE -$nice ) } +function _generateCCapabilityOptions +{ + local vdir=$1 + local cap + local f="$vdir"/ccapabilities + + test -e "$f" || return 0 + while read cap; do + case x"$cap" in + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );; + esac + done <"$f" +} + +function _generateBCapabilityOptions +{ + local vdir=$1 + local cap + local f="$vdir"/bcapabilities + + test -e "$f" || return 0 + while read cap; do + case x"$cap" in + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );; + esac + done <"$f" +} + function _generateCapabilityOptions { local vdir=$1 local cap + _generateBCapabilityOptions "$vdir" + _generateCCapabilityOptions "$vdir" + test -e "$vdir"/capabilities || return 0 CAP_OPTS=() @@ -102,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 } @@ -176,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 @@ -188,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 ) @@ -197,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 ) @@ -208,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 @@ -236,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" ) @@ -357,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 @@ -462,6 +494,15 @@ function generateOptions _generateChcontextOptions "$1" } +function _mountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + "$@" $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$fstab" +} + function mountVserver { local cfgdir=$1 @@ -469,7 +510,8 @@ function mountVserver local vdir=$1/vdir local mtab_src - test -e "$cfgdir"/fstab || return 0 + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local || return 0 findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null @@ -481,36 +523,50 @@ function mountVserver test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ $_VNAMESPACE --cleanup - - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + _mountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" + _mountVserverInternal "$cfgdir"/fstab.local isAvoidNamespace "$cfgdir" || \ $_SECURE_MOUNT --rbind -n "$vdir" "/" } +function _umountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + tac "$fstab" | { + is_ok=1 + while read src dst tmp; do + test "$tmp" || continue + case x"$src" in + (x\#*) continue;; + esac + + + "$@" $_EXEC_CD "$dst" $_UMOUNT -lfn . || is_ok= + done + test "$is_ok" + } +} + function umountVserver { local cfgdir=$1 local vdir=$1/vdir + local is_ok=1 - is_ok=1 - - isAvoidNamespace "$cfgdir" || return 0 - test -e "$cfgdir"/fstab || return 0 - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" + isAvoidNamespace "$cfgdir" || return 0 + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local || return 0 + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" - pushd "$vdir/" >/dev/null - tac "$cfgdir"/fstab | while read src dst tmp; do - test "$tmp" || continue - case x"$src" in - x#*) continue;; - esac - - $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \ - $_UMOUNT -lfn . || is_ok= - done - popd >/dev/null + pushd "$vdir/" >/dev/null || return 1 + _umountVserverInternal "$cfgdir"/fstab.local || is_ok= + _umountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" || is_ok= + popd >/dev/null || return 1 test "$is_ok" }