- Use isolinux config files included in the d-i debian-cd_info tarball

so it does not need to be maintained in both places.

debian/changelog

@@ -23,6 +23,8 @@ debian-cd (2.2.23) unstable; UNRELEASED
     - Completed access cd-drivers transition.
     - d-i renamed syslinux.txt to boot.txt, us new name instead of
       renaming file from d-i.
+    - Use isolinux config files included in the d-i debian-cd_info tarball
+      so it does not need to be maintained in both places.
   * Stephen R. Marenka
     - Changed m68k boot for etch to handle etch changes in d-i.
 	

tools/boot/etch/boot-amd64

@@ -66,41 +66,17 @@ cp -lf cdrom/vmlinuz $CDDIR/install/
 cp -lf cdrom/initrd.gz $CDDIR/install/
 echo -n "-cache-inodes -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
 
-cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL linux
-  kernel /install/vmlinuz
-LABEL cdrom
-  kernel /install/vmlinuz
-LABEL expert
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-DISPLAY boot.txt
-TIMEOUT 0
-PROMPT 1
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-EOF
-
 # Include Smart Boot Manager image for people where isolinux fails
 gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
 # Keep the original file timestamp
 touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
 cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
-# Isolinux help files come from d-i.
+# Isolinux setup including config and help files comes from d-i.
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
 if [ -e boot$N/isolinux/f3.txt.only26 ];then
 	mv boot$N/isolinux/f3.txt.only26 boot$N/isolinux/f3.txt
 fi
+
 if [ "$SPLASHPNG" ] ; then
 	# Insert our own splash screen.  Color index 15 is
 	# background, and index 7 is foreground.  Set to black and
@@ -109,6 +85,12 @@ if [ "$SPLASHPNG" ] ; then
 		ppmtolss16 "#ffffff=7" "#000000=15" > boot$N/isolinux/splash.rle
 fi
 
+if [ -n "$KERNEL_PARAMS" ]; then
+	# Substitute custom kernel params into the isolinux config
+	# file.
+	sed -i "s/append /append $KERNEL_PARAMS/" boot$N/isolinux/isolinux.cfg
+fi
+
 # write final lines to mkisofs_opts
 echo -n "boot$N " >> $N.mkisofs_opts
 

tools/boot/etch/boot-i386

@@ -111,75 +111,6 @@ else
     fi
 fi
 
-write_isolinux_config () {
-	cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL linux
-  kernel /install/vmlinuz
-LABEL cdrom
-  kernel /install/vmlinuz
-LABEL expert
-  kernel /install/vmlinuz
-  append DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL rescue
-  kernel /install/vmlinuz
-  append rescue/enable=true vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-DISPLAY boot.txt
-TIMEOUT 0
-PROMPT 1
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-EOF
-}
-
-write_isolinux_config_26 () {
-	cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL linux
-  kernel /install/vmlinuz
-LABEL cdrom
-  kernel /install/vmlinuz
-LABEL linux26
-  kernel /install/2.6/vmlinuz
-  append $KERNEL_PARAMS vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL expert
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL expert26
-  kernel /install/2.6/vmlinuz
-  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL rescue
-  kernel /install/vmlinuz
-  append $KERNEL_PARAMS rescue/enable=true vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-LABEL rescue26
-  kernel /install/2.6/vmlinuz
-  append $KERNEL_PARAMS rescue/enable=true vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 devfs=mount,dall rw --
-DISPLAY boot.txt
-TIMEOUT 0
-PROMPT 1
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-EOF
-}
-
 # Only disk one gets the extra files installed
 if [ "$NN" = "1" ]; then
 	# populate the install directory as well
@@ -217,9 +148,9 @@ if [ "$NN" = "1" ]; then
 			fi
 		done
 		cp -a cdrom/2.6 $CDDIR/install/2.6
-		write_isolinux_config_26
+		mv boot$N/isolinux/isolinux.cfg.with26 boot$N/isolinux/isolinux.cfg
 	else 
-		write_isolinux_config
+		rm -f boot$N/isolinux/isolinux.cfg.with26
 	fi
 	if [ -e boot$N/isolinux/f4.txt.with26 ];then
 		mv boot$N/isolinux/f4.txt.with26 boot$N/isolinux/f4.txt
@@ -232,6 +163,12 @@ if [ "$NN" = "1" ]; then
 		pngtopnm < $SPLASHPNG | ppmquant 16 | \
 			ppmtolss16 "#ffffff=7" "#000000=15" > boot$N/isolinux/splash.rle
 	fi
+
+	if [ -n "$KERNEL_PARAMS" ]; then
+		# Substitute custom kernel params into the isolinux config
+		# file.
+		sed -i "s/append /append $KERNEL_PARAMS/" boot$N/isolinux/isolinux.cfg
+	fi
 fi
 
 # Add autorun if we have README.html