diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86 index 058b5787..9f2df4f1 100644 --- a/tools/boot/lenny/boot-x86 +++ b/tools/boot/lenny/boot-x86 @@ -223,7 +223,8 @@ if [ "$THISTYPE" = "isolinux" ]; then if [ -z "$MULTIARCH" ]; then # Set up isolinux dir for only the current arch - for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do + # Last two for Lenny RC1 compatibility + for f in txt.cfg gtk.cfg adtxt.cfg adgtk.cfg text.cfg adtext.cfg; do if [ -e boot$N/isolinux/$f ]; then sed -i "s|/install/|/$INSTALLDIR/|" boot$N/isolinux/$f fi @@ -236,13 +237,15 @@ if [ "$THISTYPE" = "isolinux" ]; then rm -f boot$N/isolinux/adamd*.cfg else # Set up isolinux dir for multi-arch - for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do + # Last two for Lenny RC1 compatibility + for f in txt.cfg gtk.cfg adtxt.cfg adgtk.cfg text.cfg adtext.cfg; do if [ -e boot$N/isolinux/$f ]; then sed -i "s|/install/|/$INSTALLDIR_i386/|" boot$N/isolinux/$f fi done - # Last two for Lenny RC1 compatibility - for f in amdtext.cfg amdgtk.cfg amdadtext.cfg amdadgtk.cfg adamdtext.cfg adamdgtk.cfg; do + # Last three for Lenny RC1 compatibility + for f in amdtxt.cfg amdgtk.cfg amdadtxt.cfg amdadgtk.cfg \ + amdtext.cfg adamdtext.cfg adamdgtk.cfg; do if [ -e boot$N/isolinux/$f ]; then sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/isolinux/$f fi @@ -269,10 +272,11 @@ if [ "$THISTYPE" = "isolinux" ]; then # Instead, add special default label to automatically select # i386/amd64 if user hits enter from help screens. cp -f $CDDIR/../syslinux/usr/lib/syslinux/ifcpu64.c32 boot$N/isolinux/ + # text.cfg and amdtext.cfg for Lenny RC1 compatibility. sed -i "/^default install/ s/^/#/" \ - boot$N/isolinux/text.cfg + boot$N/isolinux/txt.cfg boot$N/isolinux/text.cfg sed -i "/^default64 amd64-install/ s/^/#/" \ - boot$N/isolinux/amdtext.cfg + boot$N/isolinux/amdtxt.cfg boot$N/isolinux/amdtext.cfg sed -i "/^include menu.cfg/ a\include instsel.cfg" \ boot$N/isolinux/prompt.cfg cat >boot$N/isolinux/instsel.cfg <