martin f. krafft: Do not break after first device without a scheduling class

Martin F. Krafft madduck at alioth.debian.org
Mon Jan 31 13:52:41 UTC 2011


Module: mdadm
Branch: master
Commit: ed3822ab0e153e9448121cb29f600fdce97bf48a
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=ed3822ab0e153e9448121cb29f600fdce97bf48a

Author: martin f. krafft <madduck at debian.org>
Date:   Mon Jan 31 14:48:17 2011 +0100

Do not break after first device without a scheduling class

Debian-Bug: 611627
Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog  |    5 ++++-
 debian/checkarray |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b696c4..f886286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ mdadm (3.1.5-1~unreleased.0) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.9.1; no changes required.
   * Do not print io rescheduling info message when run by cron.
+  * Fix checkarray script so that it does not die after scheduling the first
+    device when there is no scheduling class specified; thanks to Mario
+    'BitKoenig' Holbe (closes: #611627).
 
- -- martin f. krafft <madduck at debian.org>  Fri, 03 Sep 2010 11:53:37 +0200
+ -- martin f. krafft <madduck at debian.org>  Mon, 31 Jan 2011 14:48:56 +0100
 
 mdadm (3.1.4-1+8efb9d1) unstable; urgency=low
 
diff --git a/debian/checkarray b/debian/checkarray
index dafc652..6ffa994 100644
--- a/debian/checkarray
+++ b/debian/checkarray
@@ -185,7 +185,7 @@ for array in $arrays; do
         low) arg='-c2 -n7';;
         high) arg='-c2 -n0';;
         realtime) arg='-c1 -n4';;
-        *) break;;
+        *) continue;;
       esac
 
       resync_pid= wait=5
@@ -196,7 +196,7 @@ for array in $arrays; do
           if [ $cron != 1 ]; then
             echo "$PROGNAME: I: selecting $ionice I/O scheduling class for resync of $array." >&2
           fi
-          ionice -p "$resync_pid" $arg
+          ionice -p "$resync_pid" $arg || :
           break
         fi
         sleep 1




More information about the pkg-mdadm-commits mailing list