* Make daily i386/amd64 lenny builds work again - don't attempt to copy

the win32-loader files into place if they don't exist.
This commit is contained in:
Steve McIntyre 2007-09-17 10:52:03 +00:00
parent f2026f7c5f
commit c81d64da56
2 changed files with 7 additions and 1 deletions

4
debian/changelog vendored
View File

@ -16,6 +16,10 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
yet.
* Fix autorun.inf generation when win32-loader is present.
[ Steve McIntyre ]
* Make daily i386/amd64 lenny builds work again - don't attempt to copy
the win32-loader files into place if they don't exist.
-- Otavio Salvador <otavio@debian.org> Thu, 13 Sep 2007 15:28:30 -0300
debian-cd (3.0.3) unstable; urgency=low

View File

@ -172,8 +172,10 @@ if [ "$THISTYPE" = "isolinux" ]; then
# Isolinux setup including config and help files comes from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/$ISOLINUXDIR/; tar zx)
# Not everything in the tarball is isolinux stuff
mv boot$N/$ISOLINUXDIR/g2ldr* boot$N/$ISOLINUXDIR/setup.exe \
if [ -e boot$N/$ISOLINUXDIR/win32-loader.ini ] ; then
mv boot$N/$ISOLINUXDIR/g2ldr* boot$N/$ISOLINUXDIR/setup.exe \
boot$N/$ISOLINUXDIR/win32-loader.ini boot$N/
fi
if [ -e boot$N/$ISOLINUXDIR/f3.txt.withgtk ]; then
extra_image gtk/initrd.gz
mv boot$N/$ISOLINUXDIR/f3.txt.withgtk boot$N/$ISOLINUXDIR/f3.txt