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

Don't assume loadlin.exe exists. Closes: #706156 

When making a custom server netinstall ISO, it may be desired to not
have MS Windows files. Unfortunately there's currently no check for
loadlin.exe, so install.bat gets created regardless. Fix this.
This commit is contained in:
Steve McIntyre 2013-06-13 00:04:50 +01:00
parent f007eaed9d
commit 4907025c1f
3 changed files with 13 additions and 6 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.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

5
tools/boot/jessie/boot-x86
View File

@ -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/
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
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*

5
tools/boot/wheezy/boot-x86
View File

@ -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/
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
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*