X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=0997c2eff12e877480e1ce27134d984309bee519;hb=33aeea2e3003388655c554b74e7c5a73cb746d9e;hp=d5eeda5f522da03b7c1f1ca4d0e069aec83fd0bb;hpb=e5d96f93d0de60ca5fe2f30c09aef449e39e3e89;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index d5eeda5..0997c2e 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -346,6 +346,13 @@ function _generateInitOptions INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp ) ;; + (xarch) + test -n "$RUNLEVEL_START" || RUNLEVEL_START=3 + INITCMD_START=( /etc/rc.multi ) + INITCMD_STOP=( /etc/rc.shutdown ) + INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp ) + ;; + (x) ;; (*) panic "Unknown init-style '$INITSTYLE'; aborting";; esac @@ -952,7 +959,7 @@ function mountVserver _namespaceCleanup "$cfgdir" isAvoidNamespace "$cfgdir" || \ - $_SECURE_MOUNT --rbind -n "$vdir" "/" + $_SECURE_MOUNT --rbind -n -o dev "$vdir" "/" } function _umountVserverInternal @@ -1037,7 +1044,7 @@ function initWait rc=$? if test "$rc" -ne 0 -a "$rc" -ne 1; then - $_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4 + $_VPS axf | $_EGREP -e "^[ \t]*[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4 killContext "$S_CONTEXT" 9 fi @@ -1454,7 +1461,7 @@ function _handleCgroup if test -r "$dir"/name; then read name < "$dir"/name else - read name < "$vdir"/name + name="$VSERVER_NAME" fi if test "$action" = "attach"; then