From bac7536f0f5826bd4281df6223e55737c4357575 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 12 Nov 2008 18:06:29 +0000
Subject: [PATCH] Clean up no longer needed compatibility code in lenny x86
 boot script

---
 debian/changelog          |  1 +
 tools/boot/lenny/boot-x86 | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d827c118..f1513446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ debian-cd (3.0.6) UNRELEASED; urgency=low
     mirror and thus the package will be installed from there if needed.
     brltty will still get included on full CDs and DVDs through forcd1.
   * Remove references to no longer used files rawlist.exclude and list.exclude.
+  * Clean up no longer needed compatibility code in lenny x86 boot script.
 
   [ Steve McIntyre ]
   * Rename list2cds to sort_deps
diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index 0b453f55..653c452f 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -198,8 +198,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
 			sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f
 		fi
 	done
-	# amd.cfg and adamd.cfg only for backwards compatibility with D-I Lenny beta2
-	for f in amd.cfg amdtext.cfg amdgtk.cfg adamd.cfg adamdtext.cfg adamdgtk.cfg; do
+	for f in amdtext.cfg amdgtk.cfg adamdtext.cfg adamdgtk.cfg; do
 		if [ -e boot$N/$ISOLINUXDIR/$f ]; then
 			sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/$ISOLINUXDIR/$f
 		fi
@@ -230,8 +229,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
 			mv $file.tmp $file
 		done
 
-		# amd.cfg only for backwards compatibility with D-I Lenny beta2
-		if [ -e boot$N/isolinux/amdtext.cfg ] || [ -e boot$N/isolinux/amd.cfg ]; then
+		if [ -e boot$N/isolinux/amdtext.cfg ]; then
 			# Split isolinux configs exist, so the *amd*.cfg files
 			# will be loaded and set things up for amd64. No munging
 			# needed.
@@ -255,15 +253,12 @@ if [ "$THISTYPE" = "isolinux" ]; then
 			mv -f boot$N/isolinux-amd64/* boot$N/isolinux
 		fi
 
-		# amd.cfg and adamd.cfg only for backwards compatibility with D-I Lenny beta2
-		if [ -e boot$N/isolinux/amdtext.cfg ] || [ -e boot$N/isolinux/amd.cfg ]; then
+		if [ -e boot$N/isolinux/amdtext.cfg ]; then
 			# Split isolinux configs exist. Remove the *amd*.cfg
 			# files to avoid it being loaded on a disc that does
 			# not have both amd64 and i386 dirs.
-			rm -f boot$N/isolinux/amd.cfg
 			rm -f boot$N/isolinux/amdtext.cfg
 			rm -f boot$N/isolinux/amdgtk.cfg
-			rm -f boot$N/isolinux/adamd.cfg
 			rm -f boot$N/isolinux/adamdtext.cfg
 			rm -f boot$N/isolinux/adamdgtk.cfg
 		fi