← Back to branch summary

~pr0gg3d/ubuntu/oneiric/util-linux/bug-805886

« back to all changes in this revision

Viewing changes to schedutils/ionice.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2009-07-16 15:48:23 UTC
  • mfrom: (1.3.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090716154823-i26fshvs4v8h90qh
Tags: 2.16-1ubuntu1
https://launchpad.net/bugs/383697
* Merge from Debian, remaining changes:
  - Since udev is required in Ubuntu, the hwclock.sh init script is
    not called on startup and the hwclockfirst.sh init script is
    removed.
  - Remove /etc/adjtime on upgrade if it was not used.
  - Install custom blkid.conf to use /dev/.blkid.tab since we don't
    expect device names to survive a reboot
  - No lsb_release call in mount.preinst since we'd need Pre-Depends
    (LP: #383697).

Show diffs side-by-side

added added

removed removed

Lines of Context:
schedutils/ionice.c
85
85
        "\nOptions:\n"
86
86
        "  -n <classdata>      class data (0-7, lower being higher prio)\n"
87
87
        "  -c <class>          scheduling class\n"
88
 
        "                      1: realtime, 2: best-effort, 3: idle\n"
 
88
        "                      0: none, 1: realtime, 2: best-effort, 3: idle\n"
89
89
        "  -t                  ignore failures\n"
90
90
        "  -h                  this help\n\n"));
91
91
        exit(rc);
147
147
 
148
148
        switch (ioclass) {
149
149
                case IOPRIO_CLASS_NONE:
150
 
                        ioclass = IOPRIO_CLASS_BE;
 
150
                        if (set & 1)
 
151
                                warnx(_("ignoring given class data for none class"));
 
152
                        ioprio = 0;
151
153
                        break;
152
154
                case IOPRIO_CLASS_RT:
153
155
                case IOPRIO_CLASS_BE: