From: Enrico Scholz Date: Tue, 7 Dec 2004 11:14:56 +0000 (+0000) Subject: read enter-shell from the defaults-directory also X-Git-Tag: IPSENTINEL_VERSION_0_12~230 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d6c01e7d9da8684d264ee5fecdc708da18d329;p=util-vserver.git read enter-shell from the defaults-directory also use prio-bias instead of cpu-mask git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1764 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 13d8cc3..e35096e 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -160,10 +160,11 @@ function _generateCapabilityOptions function getEnterShell { local vdir=$1 + local shell_file ENTER_SHELL=() - - getFileValue ENTER_SHELL "$vdir"/shell + + getFileValue ENTER_SHELL "$vdir"/shell "$CONFDIR"/.defaults/shell test "$ENTER_SHELL" || { local i @@ -356,7 +357,7 @@ function _generateScheduleOptions local f="$vdir"/schedule test -e "$f" || return 0 - local fill_rate interval tokens tokens_min tokens_max cpu_mask + local fill_rate interval tokens tokens_min tokens_max prio_bias { { read fill_rate && \ @@ -364,18 +365,18 @@ function _generateScheduleOptions read tokens && \ read tokens_min && \ read tokens_max && \ - read cpu_mask || cpu_mask= + read prio_bias || prio_bias= } <"$f" } 2>/dev/null - test "$cpu_mask" || { + test "$prio_bias" || { echo $"Bad content in '$f'; aborting..." >&2 false } OPTS_VSCHED=( --fill-rate "$fill_rate" --interval "$interval" \ --tokens "$tokens" --tokens_min "$tokens_min" \ - --tokens_max "$tokens_max" --cpu_mask "$cpu_mask" ) + --tokens_max "$tokens_max" --priority-bias "$prio_bias" ) } function _getInterfaceValue