r62 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-02 15:20:03 +0000 (Wed, 02 Aug 2006)
New Revision: 62

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.config
Log:
* Add safety net to prevent endless loops in RAID autodetection. Now just
  falls back to starting all arrays from the initramfs if it fails to
  determine an acceptable array for the / filesystem in three tries
  (see #381007).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-02 15:17:40 UTC (rev 61)
+++ mdadm/trunk/debian/changelog	2006-08-02 15:20:03 UTC (rev 62)
@@ -11,6 +11,10 @@
     The autodetection code now doesn't care about the actual name of the array
     device, but instead only insists that it exists, is a block device, and
     recognised as an array by mdadm (mdadm --detail).
+  * Add safety net to prevent endless loops in RAID autodetection. Now just
+    falls back to starting all arrays from the initramfs if it fails to
+    determine an acceptable array for the / filesystem in three tries
+    (see #381007).
   * checkarray: correctly recognise when the kernel is too old for parity
     checks, or when there are no redundant arrays present (closes: #380746).
   * checkarray: now supports -s|--status switch to query parity check status
@@ -18,7 +22,7 @@
   * checkarray: now supports -x|--cancel switch to cancel running checks.
   * mkconf: now also outputs MAILADDR.
 
- -- martin f. krafft <madduck at debian.org>  Wed,  2 Aug 2006 16:17:09 +0100
+ -- martin f. krafft <madduck at debian.org>  Wed,  2 Aug 2006 16:18:18 +0100
 
 mdadm (2.5.2-9) unstable; urgency=low
 

Modified: mdadm/trunk/debian/mdadm.config
===================================================================
--- mdadm/trunk/debian/mdadm.config	2006-08-02 15:17:40 UTC (rev 61)
+++ mdadm/trunk/debian/mdadm.config	2006-08-02 15:20:03 UTC (rev 62)
@@ -64,6 +64,7 @@
 
 [ -n "$INITRDSTART" ] && db_set mdadm/initrdstart "$INITRDSTART"
 
+cnt=0
 while true; do
   db_input low mdadm/initrdstart || true
   db_go
@@ -110,6 +111,14 @@
         # exit the while true loop
         break
       fi
+
+      cnt=$((cnt + 1))
+      if [ $cnt -eq 3 ]; then
+        echo "W: unable to determine RAID arrays needed for boot." >&2
+        echo "W: falling back to starting all of them..." >&2
+        INITRDSTART=all
+        break
+      fi
       ;;
   esac
 done