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

[maximilian attems]

Author: maks-guest
Date: 2005-05-16 11:11:22 +0000 (Mon, 16 May 2005)
New Revision: 3124

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/init
Log:
don't try to mount root dev in case of nfs root


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-16 11:07:55 UTC (rev 3123)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-16 11:11:22 UTC (rev 3124)
@@ -9,8 +9,9 @@
     - Fix boot when using raid root with non devfs kernels.
       Closes: #284763, #269726, #305145, #299103
     - Warn if root device is not found. Closes: #283919
+    - Don't try mount a block device for nfs root. Closes: #307471
 
- -- maximilian attems <max@sputnik.stro.at>  Mon, 16 May 2005 13:05:41 +0200
+ -- maximilian attems <debian@sternwelten.at>  Mon, 16 May 2005 13:09:27 +0200
 
 initrd-tools (0.1.79) unstable; urgency=high
 

Modified: trunk/utils/initrd-tools/init
===================================================================
--- trunk/utils/initrd-tools/init	2005-05-16 11:07:55 UTC (rev 3123)
+++ trunk/utils/initrd-tools/init	2005-05-16 11:11:22 UTC (rev 3124)
@@ -426,7 +426,9 @@
     echo "Check your 'root=' argument passed on boot by bootloader."
 fi
 if [ $rootdev != 256 ] && [ $rootdev != 0 ]; then
-	mount_root
+	if [ $rootdev != 255 ]; then
+		mount_root
+	fi
 	cd mnt
 	[ $DEVFS ] && mount -nt devfs devfs dev
 	pivot_root . initrd