From: Daniel Hokka Zakrisson Date: Tue, 23 Jun 2009 17:56:47 +0000 (+0000) Subject: Don't require ionice, for ancient distributions. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f11ea684a35bdba59ce395fefc3f5bfdb39817fe;p=util-vserver.git Don't require ionice, for ancient distributions. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2839 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/configure.ac b/configure.ac index 360df94..41c848c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ ENSC_PATHPROG(NOHUP, nohup) ENSC_PATHPROG(RMMOD, rmmod) ENSC_PATHPROG(VCONFIG, vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution]) ENSC_PATHPROG(WGET, wget) -ENSC_PATHPROG(IONICE, ionice,, [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) +ENSC_PATHPROG(IONICE, ionice, [], [This is usually shipped in the 'util-linux(-ng)' or 'schedutils' package]) ENSC_PATHPROG(FILE, file, [file]) ENSC_PATHPROG(GZIP, gzip, [gzip]) ENSC_PATHPROG(BZIP2, bzip2, [bzip2]) diff --git a/scripts/vserver.functions b/scripts/vserver.functions index b8ed277..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