diff options
| author | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
| commit | 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch) | |
| tree | 5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /schedutils | |
| parent | 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff) | |
| parent | 741064af10ec81635d708e9fb8373f96341246eb (diff) | |
| download | util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz | |
Merge commit 'origin/master'
Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
Diffstat (limited to 'schedutils')
| -rw-r--r-- | schedutils/Makefile.am | 6 | ||||
| -rw-r--r-- | schedutils/ionice.1 | 3 | ||||
| -rw-r--r-- | schedutils/ionice.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am index 0c14e51a..88439f2b 100644 --- a/schedutils/Makefile.am +++ b/schedutils/Makefile.am @@ -2,18 +2,18 @@ include $(top_srcdir)/config/include-Makefile.am if BUILD_SCHEDUTILS -usrbinexec_PROGRAMS = chrt +usrbin_exec_PROGRAMS = chrt dist_man_MANS = chrt.1 if HAVE_IOPRIO_GET if HAVE_IOPRIO_SET -usrbinexec_PROGRAMS += ionice +usrbin_exec_PROGRAMS += ionice dist_man_MANS += ionice.1 endif endif if HAVE_SCHED_GETAFFINITY -usrbinexec_PROGRAMS += taskset +usrbin_exec_PROGRAMS += taskset dist_man_MANS += taskset.1 endif diff --git a/schedutils/ionice.1 b/schedutils/ionice.1 index 92712eef..0f75dfdf 100644 --- a/schedutils/ionice.1 +++ b/schedutils/ionice.1 @@ -43,7 +43,8 @@ permitted for an ordinary (i.e., non-root) user. .SH OPTIONS .IP "\fB-c \fIclass\fP" -The scheduling class. \fI1\fR for real time, \fI2\fR for best-effort, \fI3\fR for idle. +The scheduling class. \fI0\fR for none, \fI1\fR for real time, \fI2\fR for +best-effort, \fI3\fR for idle. .IP "\fB-n \fIclassdata\fP" The scheduling class data. This defines the class data, if the class accepts an argument. For real time and best-effort, \fI0-7\fR is valid diff --git a/schedutils/ionice.c b/schedutils/ionice.c index 5f1f3489..082b23ba 100644 --- a/schedutils/ionice.c +++ b/schedutils/ionice.c @@ -85,7 +85,7 @@ static void usage(int rc) "\nOptions:\n" " -n <classdata> class data (0-7, lower being higher prio)\n" " -c <class> scheduling class\n" - " 1: realtime, 2: best-effort, 3: idle\n" + " 0: none, 1: realtime, 2: best-effort, 3: idle\n" " -t ignore failures\n" " -h this help\n\n")); exit(rc); @@ -147,7 +147,9 @@ int main(int argc, char *argv[]) switch (ioclass) { case IOPRIO_CLASS_NONE: - ioclass = IOPRIO_CLASS_BE; + if (set & 1) + warnx(_("ignoring given class data for none class")); + ioprio = 0; break; case IOPRIO_CLASS_RT: case IOPRIO_CLASS_BE: |