X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=d10ccf27bf526d227d4d3f288e6db2d872ed1b8a;hb=0af41ded5e696a012f94e0903d34ae331fe821e6;hp=d35a4fe7350a3049cb81a3d40b464aeda800a304;hpb=1ab6ef93a37ff3e4e10146bccf88179024714afe;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index d35a4fe..d10ccf2 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -206,6 +206,13 @@ function _generateBCapabilityOptions _readFileToArray "$vdir"/bcapabilities OPTS_VATTRIBUTE --bcap } +function _generateUMaskOptions +{ + local vdir=$1 + + _readFileToArray "$vdir"/umask OPTS_VATTRIBUTE --umask +} + function _generateCapabilityOptions { local vdir=$1 @@ -442,6 +449,7 @@ function _generateChcontextOptions _generateCapabilityOptions "$vdir" _generateFlagOptions "$vdir" + _generateUMaskOptions "$vdir" CHCONTEXT_OPTS=( $SILENT_OPT \ "${CHCONTEXT_FLAG_OPTS[@]}" \ @@ -762,7 +770,11 @@ function disableInterfaces IP_ADDR_FLUSH) ;; IP_LINK) ;; ## Ignore the link-down command for now IP_ROUTE) $_IP route del "$@";; - TUNCTL) $_TUNCTL --~persist "$1";; + TUNCTL) + local dev="$1" + shift + $_TUNCTL --~persist "$@" "$dev" + ;; *) echo "Unknown interface-command type '$type'" >&2; false;; esac done