diff --git a/debian/changelog b/debian/changelog index 40279761..5d9a9169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ debian-cd (3.1.14) UNRELEASED; urgency=low [ Robert Spencer ] * Build without isolinux/desktop. Closes: #706150 + * Don't assume loadlin.exe exists. Closes: #706156 -- Steve McIntyre <93sam@debian.org> Mon, 06 May 2013 23:26:18 +0100 diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86 index 6c65cdbb..61341acd 100644 --- a/tools/boot/jessie/boot-x86 +++ b/tools/boot/jessie/boot-x86 @@ -186,7 +186,9 @@ echo " Using ISOLINUX boot-disks image on CD$N" mkdir -p $CDDIR/$INSTALLDIR cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/ cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/ -echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos > $CDDIR/$INSTALLDIR/install.bat +if [ -e $CDDIR/tools/loadlin.exe ]; then + echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos > $CDDIR/$INSTALLDIR/install.bat +fi mkdir -p $CDDIR/../syslinux SYSLINUXDEB=$(find_pkg_file syslinux) @@ -255,8 +257,9 @@ if [ -e boot$N/isolinux/f3.txt.withgtk ]; then if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg fi - echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat - + if [ -e $CDDIR/tools/loadlin.exe ]; then + echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat + fi fi rm -f boot$N/isolinux/isolinux.cfg.with* diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86 index 6c65cdbb..61341acd 100644 --- a/tools/boot/wheezy/boot-x86 +++ b/tools/boot/wheezy/boot-x86 @@ -186,7 +186,9 @@ echo " Using ISOLINUX boot-disks image on CD$N" mkdir -p $CDDIR/$INSTALLDIR cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/ cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/ -echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos > $CDDIR/$INSTALLDIR/install.bat +if [ -e $CDDIR/tools/loadlin.exe ]; then + echo "\\tools\\loadlin.exe vmlinuz initrd=initrd.gz" | todos > $CDDIR/$INSTALLDIR/install.bat +fi mkdir -p $CDDIR/../syslinux SYSLINUXDEB=$(find_pkg_file syslinux) @@ -255,8 +257,9 @@ if [ -e boot$N/isolinux/f3.txt.withgtk ]; then if [ -e boot$N/isolinux/isolinux.cfg.withgtk ]; then mv boot$N/isolinux/isolinux.cfg.withgtk boot$N/isolinux/isolinux.cfg fi - echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat - + if [ -e $CDDIR/tools/loadlin.exe ]; then + echo "\\tools\\loadlin.exe \\$INSTALLDIR\\vmlinuz initrd=initrd.gz vga=788" | todos > $CDDIR/$INSTALLDIR/gtk/install.bat + fi fi rm -f boot$N/isolinux/isolinux.cfg.with*