X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=238c4b8cd2ed55b5b9022a0426374ce95d60eb9d;hb=05f8e8a30aa7c113890e3d28341a010c0f994dac;hp=0d0210560037d91ef8159a8486b1c51e77dc91c6;hpb=7a9381d9fbc32f829c22d64faec3bfe4557f2c25;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 0d02105..238c4b8 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -20,6 +20,7 @@ # $VSERVER_NAME ... name of vserver declare -a NICE_CMD=() +declare -a IONICE_CMD=() declare -a CHBIND_CMD=() declare -a CAP_OPTS=() declare -a CHCONTEXT_INIT_OPTS=() @@ -135,6 +136,17 @@ function _generateNiceCommand NICE_CMD=( $_NICE -n $nice ) } +function _generateIONiceCommand +{ + local vdir=$1 + local ionice_class=2 + local ionice_priority=0 + + test -r "$vdir/ionice/class" && read ionice_class <"$vdir"/ionice/class + test -r "$vdir/ionice/priority" && read ionice_priority <"$vdir"/ionice/priority + + IONICE_CMD=( $_IONICE -c$ionice_class -n$ionice_priority ) +} function _generatePersonalityOptions { @@ -757,8 +769,7 @@ function _generateSpaceOptions local vdir="$1" local d="$vdir"/spaces - ( test ! -e "$d"/pid && - ! $_VSERVER_INFO PIDSPACE FEATURE ) || \ + ( test ! -e "$d"/pid ) || \ OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) test ! -e "$d"/net || { @@ -812,6 +823,7 @@ function generateOptions _generateInterfaceOptions "$1" test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" + _generateIONiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" _generateScheduleOptions "$1"