Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining remnants of pre-split-config support

This commit is contained in:
Frans Pop 2008-11-15 01:08:12 +00:00
parent 88824982ba
commit a8f0d9d14b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/boot/lenny/boot-x86
View File

@ -193,7 +193,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
fi fi
rm -f boot$N/$ISOLINUXDIR/isolinux.cfg.with* 2>/dev/null || true rm -f boot$N/$ISOLINUXDIR/isolinux.cfg.with* 2>/dev/null || true
for f in isolinux.cfg text.cfg gtk.cfg adtext.cfg adgtk.cfg; do for f in text.cfg gtk.cfg adtext.cfg adgtk.cfg; do
if [ -e boot$N/$ISOLINUXDIR/$f ]; then if [ -e boot$N/$ISOLINUXDIR/$f ]; then
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f
fi fi
@ -236,15 +236,12 @@ if [ "$THISTYPE" = "isolinux" ]; then
mv -f boot$N/isolinux-amd64/* boot$N/isolinux mv -f boot$N/isolinux-amd64/* boot$N/isolinux
fi fi
if [ -e boot$N/isolinux/amdtext.cfg ]; then # Remove the *amd*.cfg files to avoid them being loaded on a
# Split isolinux configs exist. Remove the *amd*.cfg # disc that does not have both amd64 and i386 dirs.
# files to avoid it being loaded on a disc that does rm -f boot$N/isolinux/amdtext.cfg
# not have both amd64 and i386 dirs. rm -f boot$N/isolinux/amdgtk.cfg
rm -f boot$N/isolinux/amdtext.cfg rm -f boot$N/isolinux/adamdtext.cfg
rm -f boot$N/isolinux/amdgtk.cfg rm -f boot$N/isolinux/adamdgtk.cfg
rm -f boot$N/isolinux/adamdtext.cfg
rm -f boot$N/isolinux/adamdgtk.cfg
fi
fi fi
rm -rf boot$N/isolinux-amd64 rm -rf boot$N/isolinux-amd64