[d-i-commits] r32133 - in trunk/installer: build/boot/x86 debian

[Joey Hess]

Author: joeyh
Date: 2005-11-15 22:25:32 +0000 (Tue, 15 Nov 2005)
New Revision: 32133

Modified:
   trunk/installer/build/boot/x86/syslinux.cfg
   trunk/installer/build/boot/x86/syslinux.cfg.with26
   trunk/installer/debian/changelog
Log:
  * Switch to root=/dev/ram in syslinux configs to support 2.6.14 post-devfs
    kernels.


Modified: trunk/installer/build/boot/x86/syslinux.cfg
===================================================================
--- trunk/installer/build/boot/x86/syslinux.cfg	2005-11-15 22:21:10 UTC (rev 32132)
+++ trunk/installer/build/boot/x86/syslinux.cfg	2005-11-15 22:25:32 UTC (rev 32133)
@@ -16,18 +16,18 @@
 
 LABEL install
 	kernel ${KERNEL}
-	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} --
 LABEL linux
 	kernel ${KERNEL}
-	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} --
 
 LABEL expert
 	kernel ${KERNEL}
-	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} --
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} --
 
 LABEL rescue
 	kernel ${KERNEL}
-	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} rescue/enable=true --
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} rescue/enable=true --
 
 PROMPT 1
 TIMEOUT 0

Modified: trunk/installer/build/boot/x86/syslinux.cfg.with26
===================================================================
--- trunk/installer/build/boot/x86/syslinux.cfg.with26	2005-11-15 22:21:10 UTC (rev 32132)
+++ trunk/installer/build/boot/x86/syslinux.cfg.with26	2005-11-15 22:25:32 UTC (rev 32133)
@@ -16,41 +16,41 @@
 
 LABEL install24
 	kernel ${KERNEL}
-	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} --
 
 LABEL expert24
 	kernel ${KERNEL}
-	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} --
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} --
 
 LABEL install
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 LABEL linux
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 LABEL install26
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 LABEL linux26
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 
 LABEL expert
 	kernel ${KERNEL_26}
-	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 LABEL expert26
 	kernel ${KERNEL_26}
-	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} --
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} --
 
 LABEL rescue
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} rescue/enable=true --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} rescue/enable=true --
 LABEL rescue24
 	kernel ${KERNEL}
-	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 rw ${CONSOLE} rescue/enable=true --
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/ram rw ${CONSOLE} rescue/enable=true --
 LABEL rescue26
 	kernel ${KERNEL_26}
-	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 rw ${CONSOLE} rescue/enable=true --
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/ram rw ${CONSOLE} rescue/enable=true --
 
 PROMPT 1
 TIMEOUT 0

Modified: trunk/installer/debian/changelog
===================================================================
--- trunk/installer/debian/changelog	2005-11-15 22:21:10 UTC (rev 32132)
+++ trunk/installer/debian/changelog	2005-11-15 22:25:32 UTC (rev 32133)
@@ -15,8 +15,12 @@
     seem to support enough of newer kernel features like aliases and
     blacklisting to be usable there yet.
 
- -- Stephen R. Marenka <smarenka at debian.org>  Mon, 31 Oct 2005 10:54:50 -0600
+  [ Joey Hess ]
+  * Switch to root=/dev/ram in syslinux configs to support 2.6.14 post-devfs
+    kernels.
 
+ -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 17:23:56 -0500
+
 debian-installer (20051026) unstable; urgency=low
 
   [ Joey Hess ]