Update for syslinux config file rename in D-I

The files (ad)amd.cfg were renamed to (ad)amdtext.cfg for consistency.
This commit is contained in:
Frans Pop 2008-09-21 22:02:10 +00:00
parent 13f5f20f46
commit 1dd8261809

View File

@ -194,7 +194,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f
fi
done
for f in amd.cfg amdgtk.cfg adamd.cfg adamdgtk.cfg; do
# 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
if [ -e boot$N/$ISOLINUXDIR/$f ]; then
sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/$ISOLINUXDIR/$f
fi
@ -225,9 +226,10 @@ if [ "$THISTYPE" = "isolinux" ]; then
mv $file.tmp $file
done
if [ -e boot$N/isolinux/amd.cfg ]; then
# Split isolinux configs exist, so the amd.cfg will
# be loaded and set things up for amd64. No munging
# 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
# Split isolinux configs exist, so the *amd*.cfg files
# will be loaded and set things up for amd64. No munging
# needed.
:
else
@ -249,13 +251,16 @@ if [ "$THISTYPE" = "isolinux" ]; then
mv -f boot$N/isolinux-amd64/* boot$N/isolinux
fi
if [ -e boot$N/isolinux/amd.cfg ]; then
# Split isolinux configs exist. Remove the amd.cfg
# to avoid it being loaded on a disc that does not
# have both amd64 and i386 dirs.
# 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
# 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
fi