r53 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-01 18:31:23 +0000 (Tue, 01 Aug 2006)
New Revision: 53

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/checkarray
Log:
* checkarray: correctly recognise when the kernel is too old for parity
  checks, or when there are no redundant arrays present.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-01 16:07:59 UTC (rev 52)
+++ mdadm/trunk/debian/changelog	2006-08-01 18:31:23 UTC (rev 53)
@@ -8,8 +8,10 @@
     RAID autodetection code (closes: #381007), which was introduced as part of
     the fix for #380596 in the 2.5.2-9 upload. The bug is RC, but it only
     applies to unstable right now, so I am not pumping up the urgency.
+  * checkarray: correctly recognise when the kernel is too old for parity
+    checks, or when there are no redundant arrays present.
 
- -- martin f. krafft <madduck at debian.org>  Tue,  1 Aug 2006 16:22:01 +0100
+ -- martin f. krafft <madduck at debian.org>  Tue,  1 Aug 2006 19:17:39 +0100
 
 mdadm (2.5.2-9) unstable; urgency=low
 

Modified: mdadm/trunk/debian/checkarray
===================================================================
--- mdadm/trunk/debian/checkarray	2006-08-01 16:07:59 UTC (rev 52)
+++ mdadm/trunk/debian/checkarray	2006-08-01 18:31:23 UTC (rev 53)
@@ -5,7 +5,7 @@
 # Copyright © 2006 martin f. krafft <madduck at debian.org>
 # distributed under the terms of the Artistic Licence.
 #
-REVISION=2006.07.07.1121
+REVISION=2006.08.01.1621
 
 PROGNAME=${0##*/}
 
@@ -97,8 +97,18 @@
   exit 5
 fi
 
+if [ -z "$(ls /sys/block/md*/md/level 2>/dev/null)" ]; then
+  [ $quiet -lt 2 ] && echo "$PROGNAME: W: kernel too old, no support for parity checks." >&2
+  exit 6
+fi
+
+if ! egrep -q '^raid([1456]|10)$' /sys/block/md*/md/level 2>/dev/null; then
+  [ $quiet -lt 1 ] && echo "$PROGNAME: I: no redundant arrays present; skipping checks..." >&2
+  exit 0
+fi
+
 if [ -z "$(ls /sys/block/md*/md/sync_action 2>/dev/null)" ]; then
-  [ $quiet -lt 2 ] && echo "$PROGNAME: E: no kernel support for parity checks." >&2
+  [ $quiet -lt 2 ] && echo "$PROGNAME: W: no kernel support for parity checks." >&2
   exit 3
 fi