From 558356a37bb6cdc0d7da17cc2516f3af1a5ddf86 Mon Sep 17 00:00:00 2001
From: cd-builder user <debian-cd@lists.debian.org>
Date: Tue, 18 Nov 2008 01:48:22 +0000
Subject: [PATCH] Stop copying the /tools/ directory on from the mirror; it's
 going away

---
 etchnhalf/data/etch/README.html.in | 13 -------------
 etchnhalf/tools/start_new_disc     | 10 ++--------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/etchnhalf/data/etch/README.html.in b/etchnhalf/data/etch/README.html.in
index 40e37b0e..45087d0f 100644
--- a/etchnhalf/data/etch/README.html.in
+++ b/etchnhalf/data/etch/README.html.in
@@ -367,19 +367,6 @@ Installing
  version of the Installation Guide</b>, which is available from the
  <A href="http://www.debian.org/releases/lenny/installmanual">Debian web site</a>.
  </blockquote>
- <P>
- Programs and other files that are needed for the installation can be found on
- this disc under
- <P>
- <tt>&nbsp;
- <A href=%%""tools/%%"">/tools/</a>
- </tt>
-#if ARCHi386
- and
- <tt>&nbsp;
- <A href=%%""install/floppy/%%"">/install/floppy/</a>
- </tt>
-#endif
 
 #if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc
   <P>
diff --git a/etchnhalf/tools/start_new_disc b/etchnhalf/tools/start_new_disc
index b0f8d894..f17f30dc 100755
--- a/etchnhalf/tools/start_new_disc
+++ b/etchnhalf/tools/start_new_disc
@@ -110,19 +110,13 @@ fi
 
 if [ $DISKNUM = 1 ] ; then
 	if [ "$OMIT_DOC_TOOLS" != "1" ]; then
-		if [ ! -e $MIRROR/tools ] || [ ! -e $MIRROR/doc ]; then
-			echo "You need a Debian mirror with the doc, tools and"
+		if [ ! -e $MIRROR/doc ]; then
+			echo "You need a Debian mirror with the doc and"
 			echo "indices directories ! "
 			exit 1
 		fi
 	fi
 		
-	# Add install stuff
-	if [ "$SOURCEONLY"x != "yes"x ] && [ "$OMIT_DOC_TOOLS" != "1" ]; then
-		echo "  Adding tools to CD1"
-		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
-	fi
-
 	echo "  Adding .disk/base_components"
 	echo "main" > $CDDIR/.disk/base_components
 	if [ -n "$LOCAL" ] ; then