merge alpha changes from 7.2-alpha

didn't merge the following:
* weird handling of /boot and the beginning of the disk.  if we do alpha again,
we need to do this in some sort of maintainable fashion
* some of the weird stuff with adding a single user target in the boot loader
config and the like

1 files changed, 45 insertions, 18 deletions

diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index de2b733c1..c6395684c 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -1,4 +1,9 @@
-SECSTAGE="raid0 raid1 raid5 ext3"
+NETMODULES="nfs de4x5 tulip depca eepro100 acenic tg3"
+SCSIMODULES="sd_mod isp_mod ide-cd aic7xxx"
+EXTRASCSI="DAC960 cpqfc BusLogic 3w-xxxx dmx3191d dpt_i2o megaraid ncr53c8xx sym53c8xx qlogicisp qlogicfc qla2x00 qla1280 cciss cpqarray"
+EXTRANET="3c509 3c59x 8139too dl2k eepro epic100 ewrk3 hamachi natsemi ne2k-pci ns83820 starfire yellowfin"
+
+SECSTAGE="sd_mod raid0 raid1 raid5 ext3 $NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
 
 prepareBootImage() {
         dd if=/dev/zero of=$MBD_TMPIMAGE bs=1k count=$BOOTDISKSIZE 2>/dev/null
@@ -8,7 +13,20 @@ prepareBootImage() {
 	mount $LODEV -t ext2 $MBD_BOOTTREE
         mkdir -p $MBD_BOOTTREE/etc
 	cat > $MBD_BOOTTREE/etc/aboot.conf <<EOF
-0:vmlinux.gz load_ramdisk=1 prompt_ramdisk=1 root=/dev/fd0
+#
+# Red Hat Linux/Alpha aboot configuration options:
+#
+#   0 - Boot the Red Hat Linux installer using a 2.4 kernel
+#   1 - Boot the Red Hat Linux installer in non graphical mode
+#   2 - Boot the Red Hat Linux installer in text only mode on ttyS0
+#       for installation control via the serial port
+#   3 - Boot in rescue mode
+#
+0:vmlinux.gz load_ramdisk=1 prompt_ramdisk=1 console=tty0          root=/dev/fd0
+1:vmlinux.gz load_ramdisk=1 prompt_ramdisk=1 console=tty0  text    root=/dev/fd0
+2:vmlinux.gz load_ramdisk=1 prompt_ramdisk=1 console=ttyS0 text    root=/dev/fd0
+3:vmlinux.gz load_ramdisk=1 prompt_ramdisk=1 console=tty0  rescue  root=/dev/fd0
+
 EOF
         cat > $MBD_BOOTTREE/etc/milo.conf <<EOF
 image=/vmlinux.gz
@@ -22,8 +40,6 @@ EOF
 	mount -o loop -t ext2 $MBD_TMPIMAGE $MBD_BOOTTREE
 }
 
-NETMODULES="nfs 3c59x de4x5 depca eepro100 ibmtr old_tulip tulip ne"
-SCSIMODULES="aic7xxx DAC960 ide-cd"
 
 mkdir -p $TOPDESTPATH/boot
 cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
@@ -31,32 +47,40 @@ cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
 mkdir -p $TOPDESTPATH/etc
 cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
 #
-# Red Hat Linux/Alpha aboot configuration
-#
-# Options:
+# Red Hat Linux/Alpha aboot configuration options:
 #
-#   0 - boot into the Red Hat Linux installer
-#   1 - boot into the Red Hat Linux installer using a 2.4 kernel
-#   2 - boot into the Red Hat Linux installer using a Jensen kernel
+#   0 - Boot the Red Hat Linux installer using a 2.4 kernel
+#   1 - Boot the Red Hat Linux installer with kernel messages sent to ttyS0
+#   2 - Boot the Red Hat Linux installer in text only mode
+#   3 - Boot the Red Hat Linux installer in text only rescue mode
 #
-0:/kernels/vmlinux.gz initrd=/images/ramdisk.img
-1:/kernels/vmlinuz.24 initrd=/images/ramdisk.img
-2:/kernels/vmlinuz.j initrd=/images/ramdisk.img
+0:/kernels/vmlinux.gz initrd=/images/cdrom.img
+1:/kernels/vmlinux.gz initrd=/images/cdrom.img console=ttyS0
+2:/kernels/vmlinux.gz initrd=/images/cdrom.img text
+3:/kernels/vmlinux.gz initrd=/images/cdrom.img rescue
+
 EOF
 
 makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
 	   --initrdsize 4096 \
 	   --padsize 1440 \
 	   --loaderbin loader \
-	   --modules "$NETMODULES $SCSIMODULES vfat cramfs"
+	   --modules "$NETMODULES $SCSIMODULES"
+
+makeinitrd --initrdto $TOPDESTPATH/images/cdrom.img \
+	   --initrdsize 8192 \
+	   --loaderbin loader \
+	   --modules "$NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
 
 makebootdisk --bootdisksize 1440 --kernelto $TOPDESTPATH/kernels/vmlinux.gz \
 	     --imagename generic.img
 
-makemainmodules "$SECSTAGE $SCSIMODULES"
-makeinstimage "netstg" "$SECSTAGE $SCSIMODULES"
-makeinstimage "hdstg" "$SECSTAGE $NETMODULES"
-makemainimage "stage2" "cramfs"
+
+makemainmodules "$SECSTAGE"
+makeinstimage "netstg" "$SECSTAGE"
+makeinstimage "hdstg" "$SECSTAGE"
+makemainimage "stage2" "cramfs "
+
 
 if [ -f $TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm ]; then
     K24_PKG=$TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm
@@ -77,4 +101,7 @@ if [ -f $KERNELPATH/kernel-jensen-*.rpm ]; then
     rm -rf $KJ_DIR
 fi
 
+makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "$SCSIMODULES $EXTRASCSI +scsi"
+makedriverdisk --padsize 1440 "Supplemental Network Device Drivers" "drvnet" "$NETMODULES $EXTRANET  +net"
+