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

maximilian attems maks-guest@costa.debian.org
Sat, 14 May 2005 15:25:44 +0000


Author: maks-guest
Date: 2005-05-14 15:25:43 +0000 (Sat, 14 May 2005)
New Revision: 3112

Modified:
   trunk/utils/initrd-tools/TODO
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
fix md raid root for non devfs kernels,
do not rely on devfs better use the already parsed $device.


Modified: trunk/utils/initrd-tools/TODO
===================================================================
--- trunk/utils/initrd-tools/TODO	2005-05-14 11:04:59 UTC (rev 3111)
+++ trunk/utils/initrd-tools/TODO	2005-05-14 15:25:43 UTC (rev 3112)
@@ -1,11 +1,10 @@
  sarge targeted items:
 	* #272143, #266609, #263169, #264440 root on sata not found
-	* #283919 warn if root device is not found when dev nonexistent
+	* #283919, #307471 warn if root device is not found when dev nonexistent
 	* #284141 do not rely on /proc/scsi
 	* #304483 ignores separate raid /boot partition
 	* #290708 dm-crypt devices initialized with wrong arguments
 	* #288010 PowerPC installed initrd misses files
-	* #284763, #269726, #305145, #299103 md wihtout devfs
 	* #281658 /etc/raidtab parse error
 	* #270087 BUSYBOX=yes -> no insmod so modprobe broken!
 	* #270898 xfs troubles

Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-14 11:04:59 UTC (rev 3111)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-14 15:25:43 UTC (rev 3112)
@@ -6,9 +6,10 @@
     - Be less noisy when unloading modules. The errors are harmless,
       beside initrd shouldn't load that bunch of modules.
       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
 
- -- maximilian attems <max@sputnik.stro.at>  Sat, 14 May 2005 13:03:24 +0200
+ -- maximilian attems <max@sputnik.stro.at>  Sat, 14 May 2005 17:22:42 +0200
 
 initrd-tools (0.1.79) unstable; urgency=high
 

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-05-14 11:04:59 UTC (rev 3111)
+++ trunk/utils/initrd-tools/mkinitrd	2005-05-14 15:25:43 UTC (rev 3112)
@@ -175,7 +175,8 @@
 	)"
 
 	printf '%s\n' $devices > getroot
-	echo mdadm -A /devfs/md/$minor -R -u $uuid $devices \
+	echo $device >&4
+	echo mdadm -A $device -R -u $uuid $devices \
 		> md$minor-script
 	echo /sbin/mdadm >&6
 }