[d-i-commits] r32088 - in trunk/packages/mdcfg: . debian

[Joey Hess]

Author: joeyh
Date: 2005-11-15 19:13:52 +0000 (Tue, 15 Nov 2005)
New Revision: 32088

Modified:
   trunk/packages/mdcfg/debian/changelog
   trunk/packages/mdcfg/mdcfg.sh
Log:
* In 2.6.14, the md kernel module was renamed to md-mod. Deal with this
  change by trying to modprobe it if modprobe md fails.

Modified: trunk/packages/mdcfg/debian/changelog
===================================================================
--- trunk/packages/mdcfg/debian/changelog	2005-11-15 19:04:28 UTC (rev 32087)
+++ trunk/packages/mdcfg/debian/changelog	2005-11-15 19:13:52 UTC (rev 32088)
@@ -1,3 +1,10 @@
+mdcfg (1.13) UNRELEASED; urgency=low
+
+  * In 2.6.14, the md kernel module was renamed to md-mod. Deal with this
+    change by trying to modprobe it if modprobe md fails.
+
+ -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 14:09:54 -0500
+
 mdcfg (1.12) unstable; urgency=low
 
   [ Colin Watson ]

Modified: trunk/packages/mdcfg/mdcfg.sh
===================================================================
--- trunk/packages/mdcfg/mdcfg.sh	2005-11-15 19:04:28 UTC (rev 32087)
+++ trunk/packages/mdcfg/mdcfg.sh	2005-11-15 19:13:52 UTC (rev 32088)
@@ -477,7 +477,7 @@
 # Try to load the necesarry modules.
 # Supported schemes: RAID 0, RAID 1, RAID 5
 depmod -a 1>/dev/null 2>&1
-modprobe md 1>/dev/null 2>&1
+modprobe md 1>/dev/null 2>&1 || modprobe md-mod 1>/dev/null 2>&1
 modprobe raid0 >/dev/null 2>&1
 modprobe raid1 1>/dev/null 2>&1
 modprobe raid5 >/dev/null 2>&1