r102 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-10 20:09:32 +0000 (Thu, 10 Aug 2006)
New Revision: 102

Modified:
   mdadm/trunk/debian/TODO
   mdadm/trunk/debian/initramfs/hook
Log:
fix partitionable array in hook and add todo to work around shortcoming

Modified: mdadm/trunk/debian/TODO
===================================================================
--- mdadm/trunk/debian/TODO	2006-08-10 19:23:38 UTC (rev 101)
+++ mdadm/trunk/debian/TODO	2006-08-10 20:09:32 UTC (rev 102)
@@ -10,5 +10,8 @@
   get rid of mdadm-name-generator.sh and move everything to debconf.config,
   then install udev rules for each naming scheme to /usr/share/mdadm and use
   ucf to install the appropriate one to /etc.
+- version-1 is a nightmare. E.g. on partitionable arrays, with / on
+  /dev/md_d0p3, mdadm -Es ignores /dev/md_d0 and just uses the name, so
+  /dev/md/<arrayname>.
 
 $Id$

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-08-10 19:23:38 UTC (rev 101)
+++ mdadm/trunk/debian/initramfs/hook	2006-08-10 20:09:32 UTC (rev 102)
@@ -47,8 +47,9 @@
   eval $(mdadm --examine --scan --config=partitions \
     | while read a dev level num uuid; do
       case "$dev" in
-        (/dev/md[0-9]*)
-          devfs_name="/dev/md/${dev#/dev/md}"
+        (/dev/md[0-9]*|/dev/md_d[0-9]*)
+          dev_part="${dev#/dev/md}"
+          devfs_name="/dev/md/${dev_part#_}"
             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