X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=2e8897eaea8766a0f5e0e04ea26d0a46ffb3e41b;hb=ae8f5839c759113a738c058b90344ab54cfda3cf;hp=63d1badb44a7532dde1cfbfd865612c4792075f4;hpb=569b1bfe1e5954fa083532dc37d2fe7418ec2d4a;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 63d1bad..2e8897e 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -147,6 +147,8 @@ function _generateIONiceCommand local ionice_class=2 local ionice_priority=0 + test -n "$_IONICE" || return 0 + test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority @@ -966,10 +968,10 @@ function mountVserver _namespaceCleanup "$cfgdir" real_vdir=$(getPhysicalDir "$vdir") - ! $_VSERVER_INFO - FEATURE PIVOT_ROOT || \ - extra_opt=,shared isAvoidNamespace "$cfgdir" || \ - $_SECURE_MOUNT --rbind -n -o dev$extra_opt "$vdir" "$real_vdir" + $_SECURE_MOUNT --rbind -n -o dev "$vdir" "$real_vdir" + ! $_VSERVER_INFO - FEATURE PIVOT_ROOT || \ + $_SECURE_MOUNT -n -o shared,rec "$real_vdir" "$real_vdir" } function _umountVserverInternal