r297 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2007-01-11 16:05:42 +0100 (Thu, 11 Jan 2007)
New Revision: 297

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm-raid
Log:
* Improved mdadm-raid init script to correctly output status information for
  drives that are initialising or adding spares.

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2007-01-10 17:28:24 UTC (rev 296)
+++ mdadm/trunk/debian/changelog	2007-01-11 15:05:42 UTC (rev 297)
@@ -2,8 +2,10 @@
 
   * More logcheck filters to prevent redundant information logged by mdadm
     --syslog.
+  * Improved mdadm-raid init script to correctly output status information for
+    drives that are initialising or adding spares.
 
- -- martin f. krafft <madduck at debian.org>  Wed, 10 Jan 2007 18:27:05 +0100
+ -- martin f. krafft <madduck at debian.org>  Thu, 11 Jan 2007 16:05:12 +0100
 
 mdadm (2.5.6-8) unstable; urgency=low
 

Modified: mdadm/trunk/debian/mdadm-raid
===================================================================
--- mdadm/trunk/debian/mdadm-raid	2007-01-10 17:28:24 UTC (rev 296)
+++ mdadm/trunk/debian/mdadm-raid	2007-01-11 15:05:42 UTC (rev 297)
@@ -143,15 +143,19 @@
               log_dev 0 $1 "already running"
               ;;
 
-            *'has been started with '[[:digit:]]*' drives.')
-              log_dev 0 $1 "started [$6/$6]"
+            *'has been started with '[[:digit:]]*' drive'*' (out of '[[:digit:]]*') and '[[:digit:]]*' spare'*'.')
+              log_dev 0 $1 "initialising [$6/${10%).}]"
               ;;
 
             *'has been started with '[[:digit:]]*' drive'*' (out of '[[:digit:]]*').')
               log_dev 0 $1 "degraded [$6/${10%).}]"
               ;;
 
-            *'assembled from '[[:digit:]]*' drive's#' - not enough to start the array.')
+            *'has been started with '[[:digit:]]*' drive'*'.')
+              log_dev 0 $1 "started [$6/$6]"
+              ;;
+
+            *'assembled from '[[:digit:]]*' drive'*' - not enough to start the array.')
               log_dev 1 $1 "not enough devices"
               ;;