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

[Steve Langasek]

Author: vorlon
Date: 2005-05-23 08:29:53 +0000 (Mon, 23 May 2005)
New Revision: 3218

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/init
Log:
revert broken check for invalid root filesystems, closes: #310316
and reopens: 283919, 307471



Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-23 05:39:20 UTC (rev 3217)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-23 08:29:53 UTC (rev 3218)
@@ -1,3 +1,12 @@
+initrd-tools (0.1.81) unstable; urgency=high
+
+  * Revert changes to root device handling in 0.1.80 (bugs #307471 and
+    #283919), as these were incorrect, did not fix RC bugs (and therefore
+    are not appropriate for the freeze), and introduced a new RC bug.
+    Closes: #310316.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 23 May 2005 01:22:48 -0700
+
 initrd-tools (0.1.80) unstable; urgency=high
 
   * Sven Luther

Modified: trunk/utils/initrd-tools/init
===================================================================
--- trunk/utils/initrd-tools/init	2005-05-23 05:39:20 UTC (rev 3217)
+++ trunk/utils/initrd-tools/init	2005-05-23 08:29:53 UTC (rev 3218)
@@ -418,14 +418,8 @@
 rootdev=$(cat proc/sys/kernel/real-root-dev)
 cmdline=$(cat /proc/cmdline)
 umount -n proc
-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
-	if [ $rootdev != 255 ]; then
-		mount_root
-	fi
+if [ $rootdev != 256 ]; then
+	mount_root
 	cd mnt
 	[ $DEVFS ] && mount -nt devfs devfs dev
 	pivot_root . initrd