X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=0d0210560037d91ef8159a8486b1c51e77dc91c6;hb=52dfff5433ea99e7427e781a1db43b68cbfe9243;hp=26edb7b992a8e64ed9f83d6b8881dc0e809985bc;hpb=c6b6501baad7853eab4109df1fde398a7303cc13;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 26edb7b..0d02105 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -757,8 +757,9 @@ function _generateSpaceOptions local vdir="$1" local d="$vdir"/spaces - test ! -e "$d"/pid || \ - OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) + ( test ! -e "$d"/pid && + ! $_VSERVER_INFO PIDSPACE FEATURE ) || \ + OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) test ! -e "$d"/net || { OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net ) @@ -1351,7 +1352,7 @@ function _namespaceCleanup done < /proc/mounts # separate loop to avoid races while reading /proc/mounts for i in "${list_umount[@]}"; do - $_UMOUNT -l -n "$i" + $_UMOUNT -l -n -i "$i" done }