X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=e02c0ddf23eb1a7c7d91534df73e983a04488708;hb=bb23ba0d1b3ab139512fd137a5e7f7241a49c2d6;hp=4bf18c88bcd71aa30da40bee2d04a64ad3d7df7a;hpb=4fc0d7c31dd9fb6bae2e77ba37d8a08ab26dd65c;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 4bf18c8..e02c0dd 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -228,8 +228,7 @@ function _generateFlagOptions while read flag; do case x"$flag" in x|x#) ;; - dummy) ;; - fakeinit) + xfakeinit) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) ;; *) @@ -440,6 +439,7 @@ function generateOptions function mountVserver { local cfgdir=$1 + local ns_opt=$2 local vdir=$1/vdir local mtab_src @@ -454,6 +454,9 @@ function mountVserver test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + isAvoidNamespace "$cfgdir" || \ + $_SECURE_MOUNT --rbind -n "$vdir" "/" } function umountVserver @@ -463,7 +466,8 @@ function umountVserver is_ok=1 - test -e "$cfgdir"/fstab || return 0 + isAvoidNamespace "$cfgdir" || return 0 + test -e "$cfgdir"/fstab || return 0 test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" pushd "$vdir/" >/dev/null