From ae8cf8b946353f9a7c28eee02d103cbe31aac1ce Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sun, 26 Mar 2023 23:10:03 +0100
Subject: [PATCH] Kill loadlin and the /tools dir

---
 debian/changelog             |  5 +++++
 tools/boot/bookworm/boot-x86 | 11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbbb4b4e..8fd66ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ debian-cd (3.2.1) UNRELEASED; urgency=medium
   [ James Addison ]
   * 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
 
 debian-cd (3.2.0) unstable; urgency=medium
diff --git a/tools/boot/bookworm/boot-x86 b/tools/boot/bookworm/boot-x86
index ec59da36..0978183c 100644
--- a/tools/boot/bookworm/boot-x86
+++ b/tools/boot/bookworm/boot-x86
@@ -157,14 +157,6 @@ if [ "$N" = "1" ]; then
                         cp -lf $disk $CDDIR/$INSTALLDIR/$dir
                 fi
         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
 
@@ -187,9 +179,6 @@ KERNEL_PARAMS="$(echo "$KERNEL_PARAMS" | sed -r "s/desktop=[^ ]* ?//")"
 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
 
 # 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