- Make syslinux configs use "install" as the label to install, in

preparation for rescue mode. "linux" continues to work for
      compatability.
    - Add "install24" and "expert24" labels to syslinux configs, in
      preparation for making i386 use 2.6 by default.

r26868

build/boot/x86/f3.txt

@@ -3,7 +3,7 @@
 
 0fAvailable boot methods:07
 
-0flinux07
+0finstall07
   Start the installation -- this is the default ${MEDIA_TYPE} install.
 0fexpert07
   Start the installation in expert mode, for maximum control.
@@ -13,7 +13,7 @@
 To use one of these boot methods, type it at the prompt, optionally
 followed by any boot parameters. For example:
 
-  boot: linux acpi=off
+  boot: install acpi=off
 
 If unsure, you should use the default boot method, with no special
 parameters, by simply pressing enter at the boot prompt.

build/boot/x86/f3.txt.with26

@@ -3,11 +3,11 @@
 
 0fAvailable boot methods:07
 
-0flinux07
+0finstall07
   Start the installation -- this is the default ${MEDIA_TYPE} install.
 0fexpert07
   Start the installation in expert mode, for maximum control.
-0flinux2607
+0finstall2607
   Start the installation using a 2.6 series linux kernel
 0fexpert2607
   Start the installation in expert mode with a 2.6 kernel.
@@ -15,7 +15,7 @@
 To use one of these boot methods, type it at the prompt, optionally
 followed by any boot parameters. For example:
 
-  boot: linux acpi=off
+  boot: install acpi=off
 
 If unsure, you should use the default boot method, with no special
 parameters, by simply pressing enter at the boot prompt.

build/boot/x86/f5.txt

@@ -18,6 +18,6 @@ disable buggy APIC interrupt routing   0fnoapic nolapic07
 
 For example:
 
-  boot: linux vga=771 noapic nolapic
+  boot: install vga=771 noapic nolapic
 
 Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}

build/boot/x86/f6.txt

@@ -18,6 +18,6 @@ Trantor T128                 0ft128=0bmem_base0f,0birq07
 
 For example:
 
-  boot: linux sym53c8xx=safe
+  boot: install sym53c8xx=safe
 
 Press F1control and F then 1 for the help index, or ENTER to ${BOOTPROMPT}

build/boot/x86/f7.txt

@@ -15,7 +15,7 @@ Set keyboard map                        0fbootkbd=es07
 
 For example:
 
-  boot: linux debian-installer/framebuffer=false
+  boot: install debian-installer/framebuffer=false
 
 
 

build/boot/x86/syslinux.cfg

@@ -1,6 +1,5 @@
 ${SYSLINUX_SERIAL}
-display ${SYSDIR}syslinux.txt
-default linux
+DISPLAY ${SYSDIR}syslinux.txt
 
 F1 ${SYSDIR}f1.txt
 F2 ${SYSDIR}f2.txt
@@ -13,12 +12,24 @@ F8 ${SYSDIR}f8.txt
 F9 ${SYSDIR}f9.txt
 F0 ${SYSDIR}f10.txt
 
-label linux
+DEFAULT install
+
+LABEL install
+	kernel ${KERNEL}
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+LABEL install24
+	kernel ${KERNEL}
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+LABEL linux
 	kernel ${KERNEL}
 	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
-label expert
+
+LABEL expert
+	kernel ${KERNEL}
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+LABEL expert24
 	kernel ${KERNEL}
 	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
 
-prompt 1
-timeout 0
+PROMPT 1
+TIMEOUT 0

build/boot/x86/syslinux.cfg.with26

@@ -1,6 +1,5 @@
 ${SYSLINUX_SERIAL}
-display ${SYSDIR}syslinux.txt
-default linux
+DISPLAY ${SYSDIR}syslinux.txt
 
 F1 ${SYSDIR}f1.txt
 F2 ${SYSDIR}f2.txt
@@ -13,18 +12,35 @@ F8 ${SYSDIR}f8.txt
 F9 ${SYSDIR}f9.txt
 F0 ${SYSDIR}f10.txt
 
-label linux
+DEFAULT install
+
+LABEL install
+	kernel ${KERNEL}
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+LABEL install24
 	kernel ${KERNEL}
 	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
-label expert
+LABEL linux
+	kernel ${KERNEL}
+	append vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+
+LABEL expert
 	kernel ${KERNEL}
 	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
-label linux26
+LABEL expert24
+	kernel ${KERNEL}
+	append DEBCONF_PRIORITY=low vga=normal initrd=${INITRD} ramdisk_size=${RAMDISK_SIZE} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
+
+LABEL install26
 	kernel ${KERNEL_26}
 	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 devfs=mount,dall rw ${CONSOLE} --
-label expert26
+LABEL linux26
+	kernel ${KERNEL_26}
+	append vga=normal initrd=${INITRD_26} ramdisk_size=${RAMDISK_SIZE_26} root=/dev/rd/0 devfs=mount,dall 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 devfs=mount,dall rw ${CONSOLE} --
 
-prompt 1
-timeout 0
+PROMPT 1
+TIMEOUT 0

debian/changelog

@@ -24,6 +24,11 @@ debian-installer (trunk) UNRELEASED; urgency=low
     - The localudebs directory is managed as an apt repository now, complete
       with Packages file. Build-depend on apt-utils for this.
     - Remove localudebs caveat from README, above change should fix it.
+    - Make syslinux configs use "install" as the label to install, in
+      preparation for rescue mode. "linux" continues to work for
+      compatability.
+    - Add "install24" and "expert24" labels to syslinux configs, in
+      preparation for making i386 use 2.6 by default.
   * Kurt Roeckx
     - Changed libdevmapper1.00-udeb to libdevmapper1.01-udeb in the monolithic
       package list.