- Use d-i boot screens from the debian-cd_info.tar.gz.

- Remove the netboot initrd from netinst CDs, since d-i builds a mini-iso
      with this initrd on it, and since the d-i help screen does not mention
      the net type.

debian/changelog

@@ -42,6 +42,10 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
     - Add the debian-edu udebs to the exclude list for netinst CDs, and
       remove the deleted di-utils-devicefiles.
     - Update boot/sarge/boot-i386 to use the new d-i image names.
+    - Use d-i boot screens from the debian-cd_info.tar.gz.
+    - Remove the netboot initrd from netinst CDs, since d-i builds a mini-iso
+      with this initrd on it, and since the d-i help screen does not mention
+      the net type.
   * Steve Langasek
     - Add fdisk-udeb to the list of needed debs for alpha
     - Use /dev/ram as the root device for aboot (alpha)

tools/boot/sarge/boot-i386

@@ -44,7 +44,7 @@ KTYPE[10]=""
 
 THISTYPE=${KTYPE[$NN]}
 
-BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz netboot/initrd.gz"
+BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
 DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img floppy/net-drivers.img "
 
 # Download boot images
@@ -62,7 +62,6 @@ if [ "$NN" = "1" ]; then
     cp -f $BASEDIR/data/$CODENAME/isolinux.bin boot$N/isolinux/
     cp -lf cdrom/vmlinuz $CDDIR/install/
     cp -lf cdrom/initrd.gz $CDDIR/install/cdrom.gz
-    cp -lf netboot/initrd.gz $CDDIR/install/net.gz
     echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
 else
     if [ -n "$THISTYPE" ]; then
@@ -97,14 +96,9 @@ gzip -dc $BASEDIR/data/$CODENAME/sbm.bin.gz > $CDDIR/install/sbm.bin
 # Keep the original file timestamp
 touch -r $BASEDIR/data/$CODENAME/sbm.bin.gz $CDDIR/install/sbm.bin
 cp -p $BASEDIR/data/$CODENAME/README.sbm $CDDIR/install/
-# Isolinux help files come from the d-i tree (mostly).
-BUILD_DATE=$(date +%Y%m%d)
-for file in $BASEDIR/data/$CODENAME/isolinux.txt $BASEDIR/data/$CODENAME/f*.txt; do
-	sed -e "s/\${MEDIA_TYPE}/CDROM/" \
-	    -e "s/\${DEBIAN_VERSION}/${CODENAME}/" \
-	    -e "s/\${BUILD_DATE}/${BUILD_DATE}/" \
-		< $file > boot$N/isolinux/$(basename $file)
-done
+# Isolinux help files come from d-i.
+cat cdrom/debian-cd_info.tar.gz | (cd boot$N/isolinux/; tar zx)
+mv -f boot$N/isolinux/syslinux.txt boot$N/isolinux/isolinux.txt
 # Isolinux config file.
 cat > boot$N/isolinux/isolinux.cfg <<EOF
 DEFAULT /install/vmlinuz
@@ -116,9 +110,6 @@ LABEL cdrom
 LABEL expert
   kernel /install/vmlinuz
   append DEBCONF_PRIORITY=low vga=normal initrd=/install/cdrom.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-LABEL net
-  kernel /install/vmlinuz
-  append vga=normal initrd=/install/net.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 DISPLAY isolinux.txt
 TIMEOUT 0
 PROMPT 1
@@ -147,25 +138,9 @@ If your system does not use smartdrv an error message will appear,
 you can safely ignore that.
 smartdrv /c
 
-echo Please choose an install method now
-echo 1= CDROM install
-echo 2= NET install
-
-choice /c:12
-if errorlevel 2 goto TWO
-if errorlevel 1 goto ONE
-
-echo doing default somehow and going to ONE
-goto ONE
-
-:ONE
 echo using CDROM install
 loadlin.exe vmlinuz vga=normal initrd=cdrom.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 
-:TWO
-echo using NET install
-loadlin.exe vmlinuz vga=normal initrd=net.gz ramdisk_size=8192 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
-
 EOF
 ) |todos > $CDDIR/install/boot.bat