From 73a4345271e33e249dab84802323a95a48d76700 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Fri, 8 Jul 2005 08:07:22 +0000
Subject: [PATCH]     - Completed access cd-drivers transition.     - d-i
 renamed syslinux.txt to boot.txt, us new name instead of       renaming file
 from d-i.

---
 debian/changelog           |  3 +++
 tools/boot/etch/boot-amd64 |  3 +--
 tools/boot/etch/boot-i386  | 12 +++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0de61f1f..81f26c97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ debian-cd (2.2.23) unstable; UNRELEASED
     - Synced up all sarge changes to etch.
     - Use dpkg --print-architecture instead of now-deprecated
       --print-installation-architecture
+    - Completed access cd-drivers transition.
+    - d-i renamed syslinux.txt to boot.txt, us new name instead of
+      renaming file from d-i.
   * Stephen R. Marenka
     - Changed m68k boot for etch to handle etch changes in d-i.
 	
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index 672e7aed..2bba0ee4 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -77,7 +77,7 @@ LABEL cdrom
 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 isolinux.txt
+DISPLAY boot.txt
 TIMEOUT 0
 PROMPT 1
 F1 f1.txt
@@ -99,7 +99,6 @@ 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.
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
-mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
 if [ -e boot$N/isolinux/f3.txt.only26 ];then
 	mv boot$N/isolinux/f3.txt.only26 boot$N/isolinux/f3.txt
 fi
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index 665fe99a..79553851 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -53,9 +53,7 @@ BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.t
 DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
 # Only include extra disk images on full CDs, not on smaller images.
 if [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
-	# Note that floppy/access/drivers.img was renamed to cd-drivers, both
-	# present for the transition.
-	EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img"
+	EXTRA_DISK_IMAGES="floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/net-drivers.cfg"
 fi
 
 # Download boot images and floppies.
@@ -127,7 +125,7 @@ LABEL expert
 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 isolinux.txt
+DISPLAY boot.txt
 TIMEOUT 0
 PROMPT 1
 F1 f1.txt
@@ -166,7 +164,7 @@ LABEL rescue
 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 isolinux.txt
+DISPLAY boot.txt
 TIMEOUT 0
 PROMPT 1
 F1 f1.txt
@@ -198,9 +196,9 @@ if [ "$NN" = "1" ]; then
 	# 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)
-	mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
 	# TODO: is using the .with26 file as a flag really the best way?
 	if [ -e boot$N/isolinux/f3.txt.with26 ];then
 		mv boot$N/isolinux/f3.txt.with26 boot$N/isolinux/f3.txt