Adapt to changes with woody boot floppies. Largely untested, but the

previous version didn't work at all, so it can only have improved :)

tools/boot/woody/boot-alpha

@@ -4,11 +4,13 @@
 # and Loic Prylli <Loic.Prylli@ens-lyon.fr>
 # Released under GPL 31 Mar 1999
 # See the file COPYING for license details
-# Released as part of the slink_cd package, not much use standalone
+# Released as part of the debian-cd package, not much use standalone
 #
 # Do install stuff for alpha, including making bootable CDs
 #
 
+# FIXME: This script ignores jensen, which needs a custom kernel.
+
 set -e
 
 N=$1
@@ -17,38 +19,59 @@ CDDIR=$2
 cd $CDDIR/..
 
 # Only disc 1 bootable
-
-if [ $N != 1 ]; then 
+if [ $N != 1 -a $N != 1_NONUS ]; then 
 	echo "-J" > $N.mkisofs_opts
 	exit 0; 
 fi
 
-# Hack for bootable disks
+echo -n "-J boot1" > $N.mkisofs_opts
+
 mkdir -p boot1/boot
 
-echo -n "-J boot1" > 1.mkisofs_opts
+FLOPPIES=$CDDIR/dists/$CODENAME/main/disks-alpha/current/
 
-echo "extract aboot(bootlx) from sable set"
-echo dump srmbootcode boot1/boot/bootlx |\
-     debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/sable/resc1440.bin
-for subarch in avanti avanti-s xl xlt cabriolet eb66 eb66p eb64p eb164 pc164 \
-      lx164 sx164 jensen noname takara mikasa mikasa-p noritake noritake-p alcor miata \
-           sable sable-g  book1    ruffian; do      
- mkdir boot1/boot/$subarch
- echo "drive m: file=\"$CDDIR/dists/stable/main/disks-$ARCH/current/$subarch/resc1440.bin\"" > mtoolsrc.tmp
- echo "extracting stuff for $subarch"
- case $subarch in
-          jensen|noritake*|mikasa-p|sable*|book1|miata-s|avanti-s|generic)
-       echo dump linux boot1/boot/$subarch/linux |\
-          debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/$subarch/resc1440.bin
-       ;;
-       ruffian)
-         MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:ldmilo.exe boot1/boot/$subarch/.
-   ;;         
-       *)
-         MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:linload.exe boot1/boot/$subarch/.
-   ;;
-  esac
-done
+# Use the generic linux image
+cp -f $FLOPPIES/linux boot1/boot/linux
+
+# Copy over the subarch boot-loaders
+mkdir -p boot1/milo
+cp -f $FLOPPIES/MILO/linload.exe boot1/milo/
+cp -f $FLOPPIES/MILO/ldmilo.exe  boot1/milo/
+cp -f $(ls $FLOPPIES/MILO/milo_*.bin | sed 's,\(.*\)milo_\(.*\).bin,\1\2,') \
+	 boot1/milo/
+
+# Now the APB stuff
+mkdir -p boot1/apb
+cp -f $FLOPPIES/APB/* boot1/apb/
+
+# Prepare aboot stuff.  The bootloader itself will be installed in
+# boot-alpha-post via isomarkboot.
+
+mkdir -p boot1/etc
+cat <<EOF > boot1/etc/aboot.conf
+0:boot/linux root=/dev/ram initrd=boot/root.bin
+1:boot/linux root=/dev/ram initrd=boot/root.bin console=ttyS0
+2:boot/linux root=/dev/ram initrd=boot/root.bin console=ttyS1
+EOF
+
+cp -f $FLOPPIES/images-1.44/root.bin boot1/boot/root.bin
+
+mkdir -p $CDDIR/tools/rawrite1
+(cd $CDDIR/tools/rawrite1; \
+   unzip -oLq $MIRROR/tools/rawrite1.zip )
+
+mkdir -p $CDDIR/tools/rawrite2
+(cd $CDDIR/tools/rawrite2; \
+   unzip -oLq $MIRROR/tools/rawrite2.zip; \
+   rm rawrite2.c )
+
+(echo "Tools for DOS :" ; \
+   echo "rawrite1/       rawrite 1.3 : create disks from disk images (*.bin)"; \
+   echo "rawrite2/       rawrite 2.0 : create disks from disk images (*.bin)"; \
+   echo "         rawrite 2.0 is much faster, but it locks up on some machines";\
+   ) |todos > $CDDIR/tools/README.tools
+
+cp -f $CDDIR/tools/rawrite1/rawrite3.com $CDDIR/install/rw1_3.com
+cp -f $CDDIR/tools/rawrite2/rawrite2.exe $CDDIR/install/rw2_0.exe
 
 exit 0

tools/boot/woody/post-boot-alpha

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# post-boot-alpha, by David Huggins-Daines <dhd@linuxcare.com>
+#
+# You may copy, modify and distribute this under the terms of the GNU
+# General Public License, included herein by reference.  See COPYING.
+#
+# Do post-image-building tasks for alpha to make CDs bootable
+
+set -ev
+
+N=$1
+CDROOT=$2
+CDIMAGE=$3
+
+# Only disk 1 is bootable
+if [ $N != 1 -a $N != 1_NONUS ]; then
+    exit 0
+fi
+
+isomarkboot $CDIMAGE /boot/bootlx $CDROOT/images-1.44/root.bin