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

Clean up no longer needed compatibility code in lenny x86 boot script

This commit is contained in:
Frans Pop 2008-11-12 18:06:29 +00:00
parent 57e6df8fcd
commit bac7536f0f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ debian-cd (3.0.6) UNRELEASED; urgency=low
mirror and thus the package will be installed from there if needed. mirror and thus the package will be installed from there if needed.
brltty will still get included on full CDs and DVDs through forcd1. brltty will still get included on full CDs and DVDs through forcd1.
* Remove references to no longer used files rawlist.exclude and list.exclude. * 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 ] [ Steve McIntyre ]
* Rename list2cds to sort_deps * Rename list2cds to sort_deps

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

@ -198,8 +198,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/$f
fi fi
done done
# amd.cfg and adamd.cfg only for backwards compatibility with D-I Lenny beta2 for f in amdtext.cfg amdgtk.cfg adamdtext.cfg adamdgtk.cfg; do
for f in amd.cfg amdtext.cfg amdgtk.cfg adamd.cfg adamdtext.cfg adamdgtk.cfg; do
if [ -e boot$N/$ISOLINUXDIR/$f ]; then if [ -e boot$N/$ISOLINUXDIR/$f ]; then
sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/$ISOLINUXDIR/$f sed -i "s|/install/|/$INSTALLDIR_amd64/|" boot$N/$ISOLINUXDIR/$f
fi fi
@ -230,8 +229,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
mv $file.tmp $file mv $file.tmp $file
done done
# amd.cfg only for backwards compatibility with D-I Lenny beta2 if [ -e boot$N/isolinux/amdtext.cfg ]; then
if [ -e boot$N/isolinux/amdtext.cfg ] || [ -e boot$N/isolinux/amd.cfg ]; then
# Split isolinux configs exist, so the *amd*.cfg files # Split isolinux configs exist, so the *amd*.cfg files
# will be loaded and set things up for amd64. No munging # will be loaded and set things up for amd64. No munging
# needed. # needed.
@ -255,15 +253,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
# amd.cfg and adamd.cfg only for backwards compatibility with D-I Lenny beta2 if [ -e boot$N/isolinux/amdtext.cfg ]; then
if [ -e boot$N/isolinux/amdtext.cfg ] || [ -e boot$N/isolinux/amd.cfg ]; then
# Split isolinux configs exist. Remove the *amd*.cfg # Split isolinux configs exist. Remove the *amd*.cfg
# files to avoid it being loaded on a disc that does # files to avoid it being loaded on a disc that does
# not have both amd64 and i386 dirs. # 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/amdtext.cfg
rm -f boot$N/isolinux/amdgtk.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/adamdtext.cfg
rm -f boot$N/isolinux/adamdgtk.cfg rm -f boot$N/isolinux/adamdgtk.cfg
fi fi