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

maximilian attems maks-guest@costa.debian.org
Mon, 16 May 2005 11:07:56 +0000


Author: maks-guest
Date: 2005-05-16 11:07:55 +0000 (Mon, 16 May 2005)
New Revision: 3123

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/init
Log:
warn if dev not found on boot.


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-16 08:12:02 UTC (rev 3122)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-16 11:07:55 UTC (rev 3123)
@@ -8,8 +8,9 @@
       Fix makes bootup less "scary" for kernels > 2.6.8.
     - Fix boot when using raid root with non devfs kernels.
       Closes: #284763, #269726, #305145, #299103
+    - Warn if root device is not found. Closes: #283919
 
- -- maximilian attems <max@sputnik.stro.at>  Sat, 14 May 2005 17:22:42 +0200
+ -- maximilian attems <max@sputnik.stro.at>  Mon, 16 May 2005 13:05:41 +0200
 
 initrd-tools (0.1.79) unstable; urgency=high
 

Modified: trunk/utils/initrd-tools/init
===================================================================
--- trunk/utils/initrd-tools/init	2005-05-16 08:12:02 UTC (rev 3122)
+++ trunk/utils/initrd-tools/init	2005-05-16 11:07:55 UTC (rev 3123)
@@ -421,7 +421,11 @@
 rootdev=$(cat proc/sys/kernel/real-root-dev)
 cmdline=$(cat /proc/cmdline)
 umount -n proc
-if [ $rootdev != 256 ]; then
+if [ $rootdev = 0 ]; then
+    echo "Kernel can not convert a name into device number."
+    echo "Check your 'root=' argument passed on boot by bootloader."
+fi
+if [ $rootdev != 256 ] && [ $rootdev != 0 ]; then
 	mount_root
 	cd mnt
 	[ $DEVFS ] && mount -nt devfs devfs dev