Don't try to copy sbm on etch CD images as it got removed.

This commit is contained in:
Raphaël Hertzog 2008-11-07 15:53:36 +00:00
parent d0734e24cc
commit 7b28512cf9
3 changed files with 4 additions and 13 deletions

5
debian/changelog vendored
View File

@ -14,6 +14,9 @@ debian-cd (3.0.6) UNRELEASED; urgency=low
* Update update_popcon to cope better with errors; now uses curl instead
of wget
[ Raphael Hertzog ]
* Don't try to copy sbm on etch CD images as it got removed.
-- Frans Pop <fjp@debian.org> Sun, 02 Nov 2008 00:03:00 +0100
debian-cd (3.0.5) unstable; urgency=low
@ -49,7 +52,7 @@ debian-cd (3.0.5) unstable; urgency=low
that file should have '#include <debian-installer-sid>'. This means we'll
no longer have to modify the Debian_* tasks in such cases.
[ Raphael Hertzog ]
[ Raphael Hertzog ]
* Switch debhelper compatibility level to 5 and use debian/compat
instead of DH_COMPAT.
* Clean up debian/rules a bit.

View File

@ -105,12 +105,6 @@ extra_image () {
}
# Include Smart Boot Manager image for people where isolinux fails
gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
# Keep the original file timestamp
touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install
# Isolinux setup including config and help files comes from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux-amd64/; tar zx)
if [ -e boot$N/isolinux-amd64/f3.txt.withgtk ]; then

View File

@ -161,12 +161,6 @@ if [ "$NN" = "1" ]; then
fi
done
# Include Smart Boot Manager image for people where isolinux fails
gzip -dc $BASEDIR/data/$DI_CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
# Keep the original file timestamp
touch -r $BASEDIR/data/$DI_CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
cp -p $BASEDIR/data/$DI_CODENAME/README.sbm $CDDIR/install/
# If the isolinux dir already exists, rename it aside for now
if [ -e boot$N/isolinux/isolinux.cfg ] ; then
mv boot$N/isolinux boot$N/isolinux-amd64