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

[Jeff Bailey]

Author: jbailey
Date: 2004-09-18 12:24:33 -0600 (Sat, 18 Sep 2004)
New Revision: 1615

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
  * Jeff Bailey
    - Turn error into a warning on modprobe failure.  Add extra text
      explaining that sometimes this warning might be erroneous.
      (Closes: #263216)


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2004-09-18 14:00:35 UTC (rev 1614)
+++ trunk/utils/initrd-tools/debian/changelog	2004-09-18 18:24:33 UTC (rev 1615)
@@ -1,3 +1,13 @@
+initrd-tools (0.1.75) UNRELEASED; urgency=low
+
+  * Jeff Bailey
+    - Turn error into a warning on modprobe failure.  Add extra text
+      explaining that sometimes this warning might be erroneous.
+      (Closes: #263216)
+    -
+
+ -- Jeff Bailey <jbailey@raspberryginger.com>  Sat, 18 Sep 2004 12:12:28 -0400
+
 initrd-tools (0.1.74) unstable; urgency=high
 
   * Joshua Kwan

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2004-09-18 14:00:35 UTC (rev 1614)
+++ trunk/utils/initrd-tools/mkinitrd	2004-09-18 18:24:33 UTC (rev 1615)
@@ -887,7 +887,10 @@
 	if [ -s modprobe.err ]; then
 		echo "$PROG: add_modules_dep_2_5: modprobe failed" >&2
 		cat modprobe.err >&2
-		exit 1
+		echo "WARNING: This failure MAY indicate that your kernel will not boot!" >&2
+		echo "but it can also be triggered by needed modules being compiled into" >&2
+		echo "the kernel." >&2
+		rm modprobe.err
 	fi
 }