r71 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-02 19:11:46 +0000 (Wed, 02 Aug 2006)
New Revision: 71

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
   mdadm/trunk/debian/mdadm.udev
Log:
* Added safety net to prevent endless loops in RAID autodetection. Now just
  which can get in the way of mdadm (also see next item).
* Added a workaround to the initramfs hook to deal with the problem with
  /dev/md/X device nodes when /dev/mdX is also present and version-0
  superblocks are in use (closes: #381181).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-02 18:37:39 UTC (rev 70)
+++ mdadm/trunk/debian/changelog	2006-08-02 19:11:46 UTC (rev 71)
@@ -11,12 +11,15 @@
     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
+  * Added 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).
   * Added udev rules file to prevent udev from ever creating md device nodes,
-    which can get in the way of mdadm.
+    which can get in the way of mdadm (also see next item).
+  * Added a workaround to the initramfs hook to deal with the problem with
+    /dev/md/X device nodes when /dev/mdX is also present and version-0
+    superblocks are in use (closes: #381181).
   * 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
@@ -25,7 +28,7 @@
   * mkconf: now also outputs MAILADDR.
   * Added /usr/share/doc/mdadm/FAQ to answer some FAQs.
 
- -- martin f. krafft <madduck at debian.org>  Wed,  2 Aug 2006 19:16:18 +0100
+ -- martin f. krafft <madduck at debian.org>  Wed,  2 Aug 2006 20:10:00 +0100
 
 mdadm (2.5.2-9) unstable; urgency=low
 

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-08-02 18:37:39 UTC (rev 70)
+++ mdadm/trunk/debian/initramfs/hook	2006-08-02 19:11:46 UTC (rev 71)
@@ -47,6 +47,16 @@
   eval $(mdadm --examine --scan --config=partitions \
     | while read a dev level num uuid; do
 
+      if expr "$dev" : '/dev/md[0-9].*' >/dev/null; then
+        devfs_name="/dev/md/${dev#/dev/md}"
+        if [ -b "$dev" ] && [ -b "$devfs_name" ] \
+            && expr "$INITRDSTART" : ".*${devfs_name}.*" >/dev/null; then
+          echo "W: mdadm: both $dev and $devfs_name exist, and $devfs_name appears to be used." >&2
+          echo "W: mdadm: applying workaround for mdadm bug, don't worry! (see #381181)" >&2
+          dev="$devfs_name"
+        fi
+      fi
+
       if [ "$INITRDSTART" = all ] || expr "$INITRDSTART" : ".*${dev}.*" >/dev/null; then
           DEVS="$DEVS ${dev}=${uuid#UUID=}"
           LEVELS="$LEVELS ${level#level=}"

Modified: mdadm/trunk/debian/mdadm.udev
===================================================================
--- mdadm/trunk/debian/mdadm.udev	2006-08-02 18:37:39 UTC (rev 70)
+++ mdadm/trunk/debian/mdadm.udev	2006-08-02 19:11:46 UTC (rev 71)
@@ -1,3 +1,3 @@
 # mdadm creates its own device nodes, and it gets really annoyed when someone
-# creates /dev/mdX nodes and it's not supposed to use them
-KERNEL="md[0-9]*", NAME=""
+# creates /dev/mdX nodes and it's not supposed to use them. see #381181.
+KERNEL=="md[0-9]*", NAME="", SYMLINK=""