Kill loadlin and the /tools dir

This commit is contained in:
Steve McIntyre 2023-03-26 23:10:03 +01:00
parent def9376769
commit ae8cf8b946
2 changed files with 5 additions and 11 deletions

5
debian/changelog vendored
View File

@ -3,6 +3,11 @@ debian-cd (3.2.1) UNRELEASED; urgency=medium
[ James Addison ] [ James Addison ]
* firmware: use hard links rather than symlinks. Closes: #1031696 * firmware: use hard links rather than symlinks. Closes: #1031696
[ Steve McIntyre ]
* Kill loadlin, nobody has DOS any more. Also Stop copying the
/tools directory from the mirror, as that's all that's left there
now.
-- Steve McIntyre <93sam@debian.org> Sun, 12 Mar 2023 18:43:21 +0000 -- Steve McIntyre <93sam@debian.org> Sun, 12 Mar 2023 18:43:21 +0000
debian-cd (3.2.0) unstable; urgency=medium debian-cd (3.2.0) unstable; urgency=medium

View File

@ -157,14 +157,6 @@ if [ "$N" = "1" ]; then
cp -lf $disk $CDDIR/$INSTALLDIR/$dir cp -lf $disk $CDDIR/$INSTALLDIR/$dir
fi fi
done done
if [ -e "$MIRROR/tools" ] && \
[ ! -e $CDDIR/tools ] && \
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
rm -Rf $CDDIR/tools/win32-loader
fi fi
fi fi
@ -187,9 +179,6 @@ KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | sed -r "s/desktop=[^ ]* ?//")"
mkdir -p $CDDIR/$INSTALLDIR mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/ cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $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
# In case of a multi-arch CD the script will be called two times. The # In case of a multi-arch CD the script will be called two times. The
# first time the isolinux dir gets set up for single arch; if it is # first time the isolinux dir gets set up for single arch; if it is