2005-10-20 Jeremy Katz <katzj@redhat.com>

	* scripts/mk-images (INITRDMODS): Define modules used in common
	across all arches here.
	(makeinstimage): Don't pass in modules for use here, they should
	all be in the initrd now.
	(makeSecondStage): Common makeSecondStage
	(doPostImages): Add a step to get called after boot images are
	created
	* scripts/mk-images.i386: Use common INITRDMODS and
	makeSecondStage, minor other cleanups.
	* scripts/mk-images.ia64: Likewise.
	* scripts/mk-images.s390: Likewise.
	* scripts/mk-images.x86_64: Likewise.
	* scripts/mk-images.ppc: Likewise.  Also, use doPostImages stuff.
	* scripts/mk-images.sparc64: Remove old file that's not correct
	for current stuff.
	* scripts/mk-images.alpha: Likewise.

8 files changed, 54 insertions, 457 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index d5e330b7e..f880bec64 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -28,9 +28,22 @@ TOPDIR=$(echo $0 | sed "s,/[^/]*$,,")
 if [ $TOPDIR = $0 ]; then
     $TOPDIR="."
 fi
-
 TOPDIR=$(cd $TOPDIR; pwd)
 
+# modules that are needed.  this is the generic "needed for every arch" stuff
+COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr"
+USBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage sd_mod sr_mod"
+FIREWIREMODS="ieee1394 ohci1394 sbp2"
+IDEMODS="ide-cd"
+SCSIMODS="sr_mod sg st sd_mod scsi_mod"
+FSMODS="fat msdos vfat ext3 reiserfs jfs xfs"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS"
+BTERMMODS="vga16fb"
+PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"
+INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $BTERMMODS $COMMONMODS $PCMCIASOCKMODS =scsi =net"
+
 # Set, verify, and create paths
     KERNELPATH=$1
     TOPDESTPATH=$2
@@ -333,11 +346,6 @@ makemainmodules() {
     rm -rf $FULLMODPATH
     rm -rf $FINALFULLMODPATH
 
-    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
-       mkdir -p $KERNELROOT/lib/modules/misc
-       find $KERNELROOT/lib/modules/*/kernel/drivers/s390/ -name "*.ko" \
-          -exec cp -f {} $KERNELROOT/lib/modules/misc \;
-    fi
     makemoduleball $extraargs $FULLMODPATH "$modlist"
     cp -ar $FULLMODPATH $FINALFULLMODPATH
     rm -rf $FULLMODPATH
@@ -757,7 +765,6 @@ makebootdisk() {
 
 makeinstimage () {
     imagename=$1
-    modlist=$(expandModuleSet "$2")
     tmpdir=/tmp/instimage.dir.$$
 
     rm -rf $tmpimage $tmpdir
@@ -765,12 +772,6 @@ makeinstimage () {
 
     mkdir -p $tmpdir
     (cd $INSTIMGTEMPLATE; find . | cpio --quiet -p $tmpdir)
-    if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
-       mkdir -p $KERNELROOT/lib/modules/misc
-       find $KERNELROOT/lib/modules/*/kernel/drivers/s390/ -name "*.ko" \
-         -exec cp -f {} $KERNELROOT/lib/modules/misc \;
-    fi
-    makemoduleball $tmpdir/modules "$modlist"
     makeproductfile $tmpdir
 
     echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img"
@@ -834,6 +835,19 @@ makemainimage () {
     rm $mmi_tmpimage
 }
 
+makeSecondStage() {
+    echo "Building minstg.img"
+    makeinstimage "minstg"
+    [ $? = 0 ] || exit 1
+    echo "Building stage2.img"
+    makemainimage "stage2" "cramfs"
+    [ $? = 0 ] || exit 1
+}
+
+doPostImages() {
+   /bin/true
+}
+
 makedriverdisk () {
     PADSIZE=""
 
@@ -979,6 +993,8 @@ for KERNELARCH in $arches; do
   done
 done
 
+doPostImages
+
 # do some clean up before making the cramfs of the second stage
 rm -rf $INSTIMGTEMPLATE/usr/lib/anaconda-runtime $INSTIMGTEMPLATE/usr/lib/syslinux $IMGPATH/usr/lib/syslinux
 
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
deleted file mode 100644
index 7adc5f8fb..000000000
--- a/scripts/mk-images.alpha
+++ /dev/null
@@ -1,97 +0,0 @@
-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 md raid0 raid1 raid5 ext3 $NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
-
-prepareBootImage() {
-        dd if=/dev/zero of=$MBD_TMPIMAGE bs=1k count=$BOOTDISKSIZE 2>/dev/null
-        echo y | /sbin/mke2fs -b 1024 -r 0 -O none $MBD_TMPIMAGE  > /dev/null 2>/dev/null
-	LODEV=`findloopdevice $MBD_TMPIMAGE`
-	e2writeboot $LODEV $BOOTDISKDIR/bootlx
-	mount $LODEV -t ext2 $MBD_BOOTTREE
-        mkdir -p $MBD_BOOTTREE/etc
-	cat > $MBD_BOOTTREE/etc/aboot.conf <<EOF
-#
-# 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
-        label=linux
-        root=/dev/fd0
-        append="load_ramdisk=1 prompt_ramdisk=1"
-EOF
-	zcat $KERNELROOT/boot/vmlinuz-* | gzip -9 > $MBD_BOOTTREE/vmlinux.gz
-	umount $LODEV
-	losetup -d $LODEV
-	mount -o loop -t ext2 $MBD_TMPIMAGE $MBD_BOOTTREE
-}
-
-makeBootImages() {
-    mkdir -p $TOPDESTPATH/boot
-    cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
-
-    mkdir -p $TOPDESTPATH/etc
-    cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
-#
-# 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 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/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"
-
-    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
-
-
-    if [ -f $KERNELPATH/kernel-jensen-*.rpm ]; then
-	KJ_PKG=$KERNELPATH/kernel-jensen-*.rpm
-	KJ_DIR=/tmp/kernelj.dir.$$
-	mkdir -p $KJ_DIR
-	rpm2cpio $KJ_PKG | (cd $KJ_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
-	cp $KJ_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.j
-	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"
-}
-
-makeSecondStage() {
-    makemainmodules "$SECSTAGE"
-    makeinstimage "netstg" "$SECSTAGE"
-    makeinstimage "hdstg" "$SECSTAGE"
-    makemainimage "stage2" "cramfs "
-}
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 027cdaed7..a093f9970 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -46,7 +46,7 @@ prepareBootTree() {
 	fi
 }
 
-mkdir -p $TOPDESTPATH/images
+mkdir -p $TOPDESTPATH/images/pxeboot
 cat > $TOPDESTPATH/images/README <<EOF
 This directory contains image files that can be used to create media
 capable of starting the $PRODUCT installation process.
@@ -64,90 +64,22 @@ booting via USB is dependent on your BIOS supporting this.  It should
 be written to the device using dd.
 EOF
 
-# LATEUSBMODS go in the second stage.  
-# FIXME: bleah, have to include sd_mod, sr_mod for usb-storage
-USBMODS="usbcore ohci-hcd uhci-hcd hid usb-storage sd_mod sr_mod"
-# usb-storage goes on both so we can reload it.  *sigh*
-LATEUSBMODS="usb-storage"
-IDEMODS="cdrom ide-cd"
-SCSIMODS="cdrom scsi_mod sd_mod sg sr_mod st"
-
-FSMODS="fat msdos vfat ext3 reiserfs jfs xfs"
-LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
-RAIDMODS="md raid0 raid1 raid5 raid6"
-SECSTAGE="agpgart $RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
-
-BTERMMODULES="vga16fb vgastate"
-COMMONMODULES="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr $USBMODS $BTERMMODULES"
-LOCALMODULES="$COMMONMODULES aic7xxx megaraid_mbox sym53c8xx $IDEMODS $SCSIMODS"
-NETWORKMODULES="$COMMONMODULES 3c59x 
-	       e100 tulip 8139too"
-#	       sis900 e100 hp100 natsemi pcnet32"
-
-PCMCIAMAINMODULES="$COMMONMODULES nfs $IDEMODS $SCSIMODS"
-
-# images we only want on the CD (usually for space reasons)
-ISOLINUXMODULES="usbcore ehci-hcd ieee1394 ohci1394 sbp2"
-
-# XXX hack hack
-PCMCIAMODULES_EXCLUDED="
-	apa1480_cb
-	iflash2+_mtd
-	iflash2_mtd
-	memory_cb
-	memory_cs
-	parport_cs
-	parport_pc
-	parport
-	serial_cs
-	serial_cb
-	sram_mtd
-"
-PCMCIAMODULES_EXCLUDED_SED="sed"
-for m in $PCMCIAMODULES_EXCLUDED
-do
-   PCMCIAMODULES_EXCLUDED_SED="$PCMCIAMODULES_EXCLUDED_SED -e 's/$m//g'"
-done
-BOOTPCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
-
-# need to make sure the base modules are included
-BOOTPCMCIAMODULES="$BOOTPCMCIAMODULES yenta_socket i82365 tcic pcmcia_core pcmcia"
-
 makeBootImages() {
- if [ "$KERNELARCH" = "i386" ]; then
-    echo "Building $KERNELARCH $TOPDESTPATH/images/pxeboot/initrd.img"
-    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
-	--nobogl \
-	--initrdsize 4750 \
-	--loaderbin loader \
-	--modules "$COMMONMODULES"
-
-    echo "Building $KERNELARCH bootdisk.img"
-    makebootdisk --kernelto $TOPDESTPATH/images/pxeboot/vmlinuz  \
-	--bootdisksize 1440 \
-	--imagename $BOOTDIR/bootdisk.img \
-	--initrd $TOPDESTPATH/images/pxeboot/initrd.img
-    [ $? = 0 ] || exit 1
-
-    rm -f $TOPDESTPATH/images/pxeboot/initrd.img
-
-  fi
-
   # FIXME: this is so that we can switch back and forth.  if we want both
   # on the CD, then more needs to be done, esp for things like isolinux.cfg
   # Right now, last one wins
   if [ "$KERNELARCH" = "i686" -o "$KERNELARCH" = "i586" -o "$KERNELARCH" = "athlon" ]; then
-    echo "Building $KERNELARCH initrd-everything.img"
-    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+    echo "Building $KERNELARCH initrd.img"
+    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
 	--initrdsize 7000 \
 	--loaderbin loader \
-	--modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $BOOTPCMCIAMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
+	--modules "$INITRDMODS"
     [ $? = 0 ] || exit 1
 
     if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
 	echo "Building isolinux directory"
 	MBD_BOOTTREE=$TOPDESTPATH/isolinux
-	MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd-everything.img
+	MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd.img
 	mkdir $MBD_BOOTTREE 2>/dev/null
 	cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin
 
@@ -161,7 +93,6 @@ makeBootImages() {
            cp $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* $MBD_BOOTTREE/memtest
            echo -e "label memtest86\n  kernel memtest\n  append -\n" >> $MBD_BOOTTREE/isolinux.cfg
 	fi
-
     else
 	echo "No isolinux binaries.  Skipping isolinux creation"
     fi
@@ -211,19 +142,3 @@ initrd.img - an initrd with support for all install methods and
 EOF
   fi
 }
-
-makeSecondStage() {
-    echo "Building main moduleball"
-    makemainmodules "=scsi =net $SECSTAGE"
-    [ $? = 0 ] || exit 1
-
-    echo "Building netstg.img"
-    makeinstimage "netstg" "=scsi $SECSTAGE"
-    [ $? = 0 ] || exit 1
-    echo "Building hdstg.img"
-    makeinstimage "hdstg" "=net $SECSTAGE"
-    [ $? = 0 ] || exit 1
-    echo "Building stage2.img"
-    makemainimage "stage2" "cramfs"
-    [ $? = 0 ] || exit 1
-}
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 134124ccc..7d691a859 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -1,18 +1,3 @@
-# LATEUSBMODS go in the second stage
-# FIXME: bleah, have to include sd_mod for usb-storage
-USBMODS="uhci-hcd ohci-hcd ehci-hcd hid keybdev usb-storage sd_mod"
-LATEUSBMODS="mousedev"
-
-BTERMMODULES="vga16fb"
-COMMONMODULES="nfs fat vfat cramfs loop floppy $BTERMMODULES"
-FSMODS="msdos vfat ext3 reiserfs jfs xfs"
-LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
-RAIDMODS="md raid0 raid1 raid5 raid6"
-SECSTAGE="nfs fat vfat $RAIDMODS $LVMMODS $FSMODS $LATEUSBMODS"
-NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3"
-SCSIMODULES="sd_mod sg sr_mod st scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid_mbox qla1280 qla2200 qla2300 sym53c8xx mptscsih mptbase ips"
-IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd sgiioc4"
-
 prepareBootImage() {
 	dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=$MBD_FILENAME 2>/dev/null
 	mkdosfs -C $MBD_FILENAME $BOOTDISKSIZE >/dev/null
@@ -39,13 +24,17 @@ EOF
 }
 
 makeBootImages() {
-    makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
+    mkdir -p $TOPDESTPATH/images/pxeboot
+    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
+	--initrdsie 12288 \
+	--loaderbin loader \
+	--modules "$INITRDMODS sgiioc4"
+    [ $? = 0 ] || exit 1
+
+    makebootdisk \
 	--imagename boot.img \
 	--bootdisksize 25600 \
-	--initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
-		     	    --initrdsize 12288 \
-			    --loaderbin loader \
-			    --modules "$COMMONMODULES $USBMODS $NETMODULES $SCSIMODULES $IDEMODULES =scsi =net"' 
+	--initrd $TOPDESTPATH/images/pxeboot/initrd.img
 
     # now make a boot iso
     mkdir -p $TOPDESTPATH/images/isopath
@@ -54,9 +43,6 @@ makeBootImages() {
     rm -rf $TOPDESTPATH/images/isopath
 
     # now make a pxe dir with kernel + initrd
-    mkdir -p $TOPDESTPATH/images/pxeboot
-    ln $TOPDESTPATH/images/ramdisk.img $TOPDESTPATH/images/pxeboot/initrd.img
-    ln $TOPDESTPATH/kernels/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
     cat > $TOPDESTPATH/images/pxeboot/README <<EOF
 The files in this directory are useful for booting a machine via PXE.  
 
@@ -65,15 +51,4 @@ vmlinuz - the kernel used for the installer
 initrd.img - an initrd with support for all install methods and
     drivers supported for installation of $PRODUCT
 EOF
-
-    # clean up
-    rm -f $TOPDESTPATH/images/ramdisk.img
-    rm -rf $TOPDESTPATH/kernels
-}
-
-makeSecondStage() {
-    makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES =scsi"
-    makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES =net"
-    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES =scsi =net"
-    makemainimage "stage2" "cramfs"
 }
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index e557ed077..bee78f904 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -1,21 +1,3 @@
-COMMONMODULES="nfs fat vfat cramfs loop floppy"
-FSMODS="msdos vfat ext3 reiserfs jfs xfs"
-IDEMODS="ide-cd"
-SCSIMODS="sd_mod sg sr_mod st"
-USBMODS="ohci-hcd uhci-hcd hid usb-storage sd_mod sr_mod"
-LATEUSBMODS="mousedev usb-storage"
-LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
-RAIDMODS="md raid0 raid1 raid5 raid6"
-SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
-NETMODULES="sungem sungem_phy tg3 ne2k-pci 3c59x 8139too olympic
-	   de4x5 acenic pcnet32 tulip natsemi e100 e1000 airport"
-
-SCSIMODULES="$SCSIMODS advansys aic7xxx initio sym53c8xx ipr"
-ISERIESMODULES="iseries_veth veth viodasd viocd ipr"
-
-# images we only want on the CD (usually for space reasons)
-ISOMODULES="ehci-hcd ieee1394 ohci1394 sbp2"
-
 prepareBootImage() {
     mkdir -p $TOPDESTPATH/images
     mkdir -p $TOPDESTPATH/isopath
@@ -31,7 +13,7 @@ makeBootImages() {
 	makeinitrd --initrdto $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \
 	    --initrdsize 8192 \
 	    --loaderbin loader \
-	    --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES $USBMODS =scsi =net"
+	    --modules "$INITRDMODS"
 
 	cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc64/vmlinuz
         sed -e "s/%BITS%/64/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \
@@ -56,7 +38,7 @@ makeBootImages() {
 	makeinitrd --initrdto $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz \
 	    --initrdsize 8192 \
 	    --loaderbin loader \
-	    --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODS $ISOMODULES $ISERIESMODULES =scsi =net"
+	    --modules "$INITRDMODS viocd"
 
 	cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/iSeries/vmlinux
 	cp $KERNELROOT/boot/System.map-* $TOPDESTPATH/ppc/iSeries/System.map
@@ -73,7 +55,7 @@ makeBootImages() {
         makeinitrd --initrdto $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \
             --initrdsize 8192 \
             --loaderbin loader \
-            --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES $USBMODS =scsi =net"
+            --modules "$INITRDMODS"
 
         cp $KERNELROOT/boot/vmlinuz-* $TOPDESTPATH/ppc/ppc32/vmlinuz
         sed -e "s/%BITS%/32/" -e "s/%PRODUCT%/$PRODUCT/" -e "s/%VERSION%/$VERSION/" \
@@ -94,7 +76,7 @@ makeBootImages() {
     fi
 }
 
-makeSecondStage() {
+doPostImages() {
     # Create boot.iso here instead of above, so we can include it all
 
     mkdir -p $TOPDESTPATH/ppc/chrp
@@ -142,9 +124,4 @@ makeSecondStage() {
 	-map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \
 	-no-desktop -allow-multidot $TOPDESTPATH/isopath
     rm -rf $TOPDESTPATH/isopath
-
-    makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODS =scsi"
-    makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODS =net"
-    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODS =scsi =net"
-    makemainimage "stage2" "cramfs"
 }
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 783a26f69..6df74c494 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -8,33 +8,18 @@ prepareBootImage() {
 	cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
 }
 
-IDEMODS=""
-SCSIMODS="scsi_mod sd_mod sg sr_mod st zfcp"
-
-FSMODS="vfat msdos ext3 reiserfs jfs xfs"
-LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
-RAIDMODS="md raid0 raid1 raid5 raid6"
-SECSTAGE="$IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS"
-DASDMODS=" dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod"
-COMMONMODULES="loop cramfs tape390 isofs $DASDMODS $SCSIMODS"
-NETWORKMODULES="$COMMONMODULES nfs ctc netiucv smsgiucv lcs qdio qeth ccwgroup ipv6"
+S390SCSIMODS="zfcp tape390"
+S390DASDMODS=" dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod"
+S390NETMODS="ctc netiucv smsgiucv lcs qdio qeth ccwgroup"
+S390MODS="$S390SCSIMODS $S390DASDMODS $S390NETMODS"
 
 makeBootImages() {
 	makeinitrd --nobogl --initrdto $TOPDESTPATH/images/initrd.img \
 	    --initrdsize 20000 \
 	    --loaderbin loader \
-	    --modules "$NETWORKMODULES"
+	    --modules "$INITRDMODS $S390MODS"
 	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
 
 	cp -v $BOOTDISKDIR/generic.prm $TOPDESTPATH/images/generic.prm
 	cp -v $BOOTDISKDIR/generic.ins $TOPDESTPATH/generic.ins
 }
-
-makeSecondStage() {
-    makemainmodules "=scsi =net $SECSTAGE"
-
-    makeinstimage "netstg" "=scsi $SECSTAGE"
-
-    makeinstimage "hdstg" "=net $SECSTAGE"
-    makemainimage "stage2" "cramfs"
-}
diff --git a/scripts/mk-images.sparc64 b/scripts/mk-images.sparc64
deleted file mode 100644
index 980fc2824..000000000
--- a/scripts/mk-images.sparc64
+++ /dev/null
@@ -1,102 +0,0 @@
-SECSTAGE="vfat md raid0 raid1 raid5"
-TILO=$IMGPATH/usr/bin/tilo
-SILO=$IMGPATH/usr/sbin/silo
-FAKEARCH=sparc64
-
-# EVIL HACK HACK
-cat $MODINFO | sed 's|ncr53c8xx|sym53c8xx|g' > $MODINFO-
-mv -f $MODINFO- $MODINFO
-
-cat $PCITABLE | sed 's|ncr53c8xx|sym53c8xx|g' > $PCITABLE-
-mv -f $PCITABLE- $PCITABLE
-
-prepareBootImage() {
-	stagedir=/tmp/sparcboot.$$
-	rm -rf $stagedir
-	mkdir -p $stagedir
-	cp $KERNELROOT/boot/vmlinuz-* $stagedir/vmlinux64.gz
-	cp $MBD_FSIMAGE $stagedir/initrd64.img
-        cp $BOOTDISKDIR/fd.b $stagedir
-	cp $BOOTDISKDIR/second.b $stagedir
-	cp $BOOTDISKDIR/*.msg $stagedir
-	cp $BOOTDISKDIR/silo64.conf  $stagedir/silo.conf
-        genromfs -V "Red Hat Linux Install" -d $stagedir -f $MBD_TMPIMAGE -a 512 -A 2048,/..
-	size=`cat $MBD_TMPIMAGE | wc -c`
-	filler=`expr $BOOTDISKSIZE "*" 1024 - $size`
-	dd if=/dev/zero bs=$filler count=1 >> $MBD_TMPIMAGE 2> /dev/null
-	echo ROM disk image: `expr $filler / 1024`k free.
-	rm -rf $stagedir
-	mount -tromfs -oloop $MBD_TMPIMAGE $MBD_BOOTTREE
-	$SILO -r $MBD_BOOTTREE -i /fd.b -b /second.b -C /silo.conf -F
-}
-
-maketftp() {
-    while [ x$(echo $1 | cut -c1-2) = x"--" ]; do
-	if [ $1 = "--kernel" ]; then
-	    TFTPKERNEL=$2
-	    shift; shift
-	    continue
-	elif [ $1 = "--initrdfrom" ]; then
-	    TFTPINITRD=$2
-	    shift; shift
-	    continue
-	elif [ $1 = "--imagename" ]; then
-	    TFTPIMAGE=$2
-	    shift; shift
-	    continue
-	fi
-	echo "bad argument $1 passed to maketftp"
-	exit 1
-    done
-	
-    $TILO vmlinux64 $TFTPKERNEL $TFTPINITRD $TFTPIMAGE
-}
-
-makeBootImages() {
-# set up the silo files
-    rm -rf $TOPDESTPATH/boot
-    rm -rf $TOPDESTPATH/etc
-    mkdir -p $TOPDESTPATH/boot
-    mkdir -p $TOPDESTPATH/etc
-
-    cp $BOOTDISKDIR/cd.b $TOPDESTPATH/boot
-    cp $BOOTDISKDIR/second.b $TOPDESTPATH/boot
-    cp $BOOTDISKDIR/*.msg $TOPDESTPATH/etc
-    cp $BOOTDISKDIR/silo.conf $TOPDESTPATH/etc
-
-# set up aout kernel images
-    rm -rf $TOPDESTPATH/kernels
-    mkdir -p $TOPDESTPATH/kernels
-    elftoaout -o $TOPDESTPATH/kernels/vmlinux64 $KERNELROOT/boot/vmlinux-*
-    gzip -9 $TOPDESTPATH/kernels/vmlinux64
-
-    SCSIMODULES="qlogicpti sg st pluto fcal soc socal
-             fc4 aic7xxx sym53c8xx qlogicisp"
-    NETMODULES="sunhme sunqe sunbmac myri_sbus 3c59x de4x5" 
-
-    makeinitrd --initrdto $TOPDESTPATH/boot/initrd64.img \
-	--initrdsize 2000 \
-	--loaderbin loader \
-	--modules "$SCSIMODULES $NETMODULES" \
-	--moduleballname modules64.cgz
-
-    maketftp --kernel $KERNELROOT/boot/vmlinux-* \
-	--imagename $TOPDESTPATH/images/tftp64.img \
-	--initrdfrom $TOPDESTPATH/boot/initrd64.img
-
-    makebootdisk --kernelto $TOPDESTPATH/boot/vmlinux64.gz  \
-	--imagename boot64.img \
-	--bootdisksize 1440 \
-	--initrdflags '--initrdsize 2000 \
-			    --loaderbin loader-local \
-			    --modules "$SCSIMODULES" \
-			    --moduleballname modules64.cgz'
-}
-
-makeSecondStage() {
-    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES" modules64.cgz
-
-    makeinstimage "netstg" "$SCSIMOUDLES $SECSTAGE"
-    makeinstimage "hdstg" "$NETMODULES $SECSTAGE"
-    makemainimage "stage2" "ext2"
-}
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 159960a10..5f9aec5c7 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -36,7 +36,7 @@ prepareBootTree() {
 	fi
 }
 
-mkdir -p $TOPDESTPATH/images
+mkdir -p $TOPDESTPATH/images/pxeboot
 cat > $TOPDESTPATH/images/README <<EOF
 This directory contains image files that can be used to create media
 capable of starting the $PRODUCT installation process.
@@ -54,68 +54,12 @@ booting via USB is dependent on your BIOS supporting this.  It should
 be written to the device using dd.
 EOF
 
-# LATEUSBMODS go in the second stage.  
-# FIXME: bleah, have to include sd_mod for usb-storage
-USBMODS="ohci-hcd uhci-hcd ehci-hcd hid usb-storage sd_mod sr_mod"
-# usb-storage goes on both so we can reload it.  *sigh*
-LATEUSBMODS="usb-storage"
-IDEMODS="ide-cd"
-SCSIMODS="sd_mod sg sr_mod st"
-
-FSMODS="msdos vfat ext3 reiserfs jfs xfs"
-LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
-RAIDMODS="md raid0 raid1 raid5 raid6"
-SECSTAGE="agpgart $RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
-
-BTERMMODULES="vga16fb"
-COMMONMODULES="vfat loop cramfs floppy edd pcspkr $USBMODS $BTERMMODULES"
-LOCALMODULES="$COMMONMODULES aic7xxx megaraid_mbox sym53c8xx $IDEMODS $SCSIMODS"
-NETWORKMODULES="$COMMONMODULES nfs 3c59x 
-	       e100 tulip pcnet32 8139too"
-#	       sis900 e100 hp100 natsemi"
-
-PCMCIAMAINMODULES="$COMMONMODULES nfs $IDEMODS $SCSIMODS"
-
-# images we only want on the CD (usually for space reasons)
-ISOLINUXMODULES="ehci-hcd ieee1394 ohci1394 sbp2"
-
-mkdir -p $TOPDESTPATH/images/pxeboot
-
-# XXX hack hack
-PCMCIAMODULES_EXCLUDED="
-	apa1480_cb
-	iflash2+_mtd
-	iflash2_mtd
-	memory_cb
-	memory_cs
-	parport_cs
-	parport_pc
-	parport
-	serial_cs
-	serial_cb
-	sram_mtd
-        aironet4500_cs
-        orinoco_cs
-        orinoco
-        orinoco_old_cs
-        wavelan_cs
-        wvlan_cs
-"
-PCMCIAMODULES_EXCLUDED_SED="sed"
-for m in $PCMCIAMODULES_EXCLUDED
-do
-   PCMCIAMODULES_EXCLUDED_SED="$PCMCIAMODULES_EXCLUDED_SED -e 's/$m//g'"
-done
-PCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
-
-mkdir -p $TOPDESTPATH/images/pxeboot
-
 makeBootImages() {
     echo "Building initrd-everything.img"
     makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
 	--initrdsize 8192 \
 	--loaderbin loader \
-	--modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
+	--modules "$INITRDMODS"
     [ $? = 0 ] || exit 1
 
     if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
@@ -169,19 +113,3 @@ initrd.img - an initrd with support for all install methods and
     drivers supported for installation of $PRODUCT
 EOF
 }
-
-makeSecondStage() {
-    echo "Building main moduleball"
-    makemainmodules "=scsi =net $SECSTAGE"
-    [ $? = 0 ] || exit 1
-
-    echo "Building netstg.img"
-    makeinstimage "netstg" "=scsi $SECSTAGE"
-    [ $? = 0 ] || exit 1
-    echo "Building hdstg.img"
-    makeinstimage "hdstg" "=net $SECSTAGE"
-    [ $? = 0 ] || exit 1
-    echo "Building stage2.img"
-    makemainimage "stage2" "cramfs"
-    [ $? = 0 ] || exit 1
-}