For etch, pick up the installation guide from the appropriate package

in the archive rather than from the d-i area.

debian/changelog

@@ -155,6 +155,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   [ Steve McIntyre ]
   * Add an initial copy of boot-amd64.calc for etch
 
+  [ Frans Pop ]
+  * For etch, pick up the installation guide from the appropriate
+    package in the archive rather than from the d-i area.
+
  -- Joey Hess <joeyh@debian.org>  Fri,  3 Feb 2006 14:22:51 -0500
 
 debian-cd (2.2.23) unstable; urgency=low

tools/etch/installtools.sh

@@ -12,23 +12,30 @@ DIR=$1
 
 if [ "$OMIT_MANUAL" != 1 ]; then
 	DOCDIR=doc
+	MANTDIR=$TDIR/installguide
 
-	if [ -n "$BOOTDISKS" -a -e $BOOTDISKS/current/$DOCDIR ] ; then
-	        DOCS=$BOOTDISKS/current/$DOCDIR
+	INSTALLGUIDE=$(zcat $MIRROR/dists/etch/main/binary-$ARCH//Packages.gz | \
+	    sed -n "s/Filename: \(pool\/main\/i\/installation-guide\/installation-guide-$ARCH.*deb\)$/\1/p")
+
+	if [ -f "$MIRROR/$INSTALLGUIDE" ]; then
+		rm -rf $MANTDIR
+		# Extract documentation from package
+		dpkg -x $MIRROR/$INSTALLGUIDE $MANTDIR || true
+
+		if [ -d $MANTDIR/usr/share/doc/installation-guide-$ARCH/ ]; then
+			cd $MANTDIR/usr/share/doc/installation-guide-$ARCH
+			rm -f changelog* copyright
+			gunzip *.gz || true
+
+			mkdir -p $DIR/$DOCDIR/install
+			if ! cp -a * $DIR/$DOCDIR/install; then
+				echo "ERROR: Unable to copy installer documentation to CD."
+			fi
+		else
+			echo "ERROR: installlation-guide package not unpacked correctly."
+		fi
 	else
-	        echo "WARNING: Using $DI_CODENAME bootdisk documentation"
-	        DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
-	fi
-
-	# Put the install documentation in /doc/install
-	if [ ! -d $DOCS ]; then
-	    echo "ERROR: Unable to copy installer documentation to CD."
-	    exit
-	fi
-	cd $DOCS
-	mkdir -p $DIR/$DOCDIR/install
-	if ! cp -a * $DIR/$DOCDIR/install; then
-	    echo "ERROR: Unable to copy installer documentation to CD."
+		echo "ERROR: package installlation-guide-$ARCH not found."
 	fi
 fi