r99 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-10 14:06:58 +0000 (Thu, 10 Aug 2006)
New Revision: 99

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.udev
Log:
attributing to Md

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-10 14:02:03 UTC (rev 98)
+++ mdadm/trunk/debian/changelog	2006-08-10 14:06:58 UTC (rev 99)
@@ -3,6 +3,7 @@
   * Readded udev rules, but consult a script now to figure out the name to
     use. This should address #382263 appropriately. In the long run, I should
     give the user a debconf question to decide which naming scheme to use.
+    Thanks to Marco d'Itri for his help.
 
  -- martin f. krafft <madduck at debian.org>  Thu, 10 Aug 2006 15:00:06 +0100
 

Modified: mdadm/trunk/debian/mdadm.udev
===================================================================
--- mdadm/trunk/debian/mdadm.udev	2006-08-10 14:02:03 UTC (rev 98)
+++ mdadm/trunk/debian/mdadm.udev	2006-08-10 14:06:58 UTC (rev 99)
@@ -1,3 +1,9 @@
 # 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. see #381181.
-KERNEL=="md[0-9]*", NAME="", SYMLINK=""
+# creates /dev/mdX nodes and it's not supposed to use them. see #381181. But
+# sometimes udev needs to create them (#382263), so we now use a script to
+# determine which one to use.
+
+KERNEL=="md[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
+  NAME="%c", SYMLINK=""
+KERNEL=="md_d[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
+  NAME="%c", SYMLINK=""