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=94f59e46398121f43c062f4b499ab9f257aa3196;hpb=1171042cfba2870d05f6dcc771f6331fb5c9ad78;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 94f59e4..e02c0dd 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -455,7 +455,7 @@ function mountVserver $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab - test -e "$cfgdir"/nonamespace || \ + isAvoidNamespace "$cfgdir" || \ $_SECURE_MOUNT --rbind -n "$vdir" "/" } @@ -466,9 +466,9 @@ function umountVserver is_ok=1 - test -e "$cfgdir"/nonamespace || return 0 - test -e "$cfgdir"/fstab || return 0 - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" + isAvoidNamespace "$cfgdir" || return 0 + 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