r993 - in trunk/utils/initrd-tools: . debian

[Martin Michlmayr]

Author: tbm
Date: 2004-08-09 07:39:25 -0600 (Mon, 09 Aug 2004)
New Revision: 993

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
As of module-init-tools 3.1-pre2-1, /lib/modules/modprobe.conf doesn't
exist anymore; handle both situations.  Thanks to Herbert Xu (closes:
#255390).


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2004-08-09 13:34:44 UTC (rev 992)
+++ trunk/utils/initrd-tools/debian/changelog	2004-08-09 13:39:25 UTC (rev 993)
@@ -2,7 +2,12 @@
 
   * Martin Michlmayr
     - Really ignore sbp2 for now (see 0.1.66) (closes: #254352).
+    - As of module-init-tools 3.1-pre2-1, /lib/modules/modprobe.conf
+      doesn't exist anymore; handle both situations.  Thanks to Herbert
+      Xu (closes: #255390).
 
+ -- Martin Michlmayr <tbm@cyrius.com>  Mon, 09 Aug 2004 14:37:17 +0100
+
 initrd-tools (0.1.72) unstable; urgency=low
 
   * Martin Michlmayr

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2004-08-09 13:34:44 UTC (rev 992)
+++ trunk/utils/initrd-tools/mkinitrd	2004-08-09 13:39:25 UTC (rev 993)
@@ -1073,8 +1073,14 @@
 			if [ $oldstyle ]; then
 				echo /etc/modules.conf
 			else
-				echo /etc/modprobe.conf
-				echo /lib/modules/modprobe.conf
+				if [ -f /lib/modules/modprobe.conf ]; then
+					echo /etc/modprobe.conf
+					echo /lib/modules/modprobe.conf
+				else
+					find /etc/modprobe.d -maxdepth 1 \
+						! -type d
+				fi
+
 				if [ -f /etc/modprobe.devfs ]; then
 					echo /etc/modprobe.devfs
 				fi