r32 - in mdadm/trunk/debian: . initramfs

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-07-27 21:59:04 +0000 (Thu, 27 Jul 2006)
New Revision: 32

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/initramfs/hook
Log:
* Copy raid456 kernel module into initramfs, if present (closes: #380152).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-07-25 06:27:16 UTC (rev 31)
+++ mdadm/trunk/debian/changelog	2006-07-27 21:59:04 UTC (rev 32)
@@ -3,6 +3,7 @@
   * Re-added rootraiddoc.97.html which was mysteriously lost (closes: #378678).
   * Catching modprobe error in case of absence of the kernel modules, or
     a non-modular kernel. Thanks to Holger Levsen.
+  * Copy raid456 kernel module into initramfs, if present (closes: #380152).
   * checkarray: check for presence of active RAID arrays and give an
     appropriate error if there are none present (closes: #379019).
   * checkarray: skip sync for RAID0 devices (closes: #379352).
@@ -15,7 +16,7 @@
     - Japanese by Hideki Yamane, thanks!
     - French by Florentin Duneau, thanks! (closes: #379511)
 
- -- martin f. krafft <madduck at debian.org>  Mon, 24 Jul 2006 23:14:29 +0100
+ -- martin f. krafft <madduck at debian.org>  Thu, 27 Jul 2006 22:49:32 +0100
 
 mdadm (2.5.2-7) unstable; urgency=low
 

Modified: mdadm/trunk/debian/initramfs/hook
===================================================================
--- mdadm/trunk/debian/initramfs/hook	2006-07-25 06:27:16 UTC (rev 31)
+++ mdadm/trunk/debian/initramfs/hook	2006-07-27 21:59:04 UTC (rev 32)
@@ -75,8 +75,10 @@
 
   copy_exec $MDADM /sbin
 
-  # copy all modules into the initramfs, just for safety
-  MODULES="linear multipath raid0 raid1 raid5 raid6 raid10"
+  # copy all modules into the initramfs, just for safety.
+  # we copy raid456 / raid5+raid6 because the hook script just won't do
+  # anything when the module cannot be found.
+  MODULES="linear multipath raid0 raid1 raid456 raid5 raid6 raid10"
   for mod in $MODULES; do manual_add_modules $mod; done
 
   # prevent problems with old md script. Since this hook is only called if