switch to bootdisk.img

create drvblock, drvnet and pcmciadd as driver disks.  since drvblock
currently won't fit, make errors non-fatal temporarily until I sit down
and figure out what drivers can be nuked to save space or how to move
things around.

1 files changed, 26 insertions, 67 deletions

diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 904f4d4c8..d23f217bd 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -94,10 +94,10 @@ SCSIMODS="sd_mod sr_mod"
 FSMODS="msdos vfat ext3 reiserfs"
 SECSTAGE="agpgart raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
 
-COMMONMODULES="vfat $USBMODS"
+COMMONMODULES="vfat nfs $USBMODS"
 LOCALMODULES="$COMMONMODULES aic7xxx megaraid ncr53c8xx 
 	     sym53c8xx $IDEMODS $SCSIMODS"
-NETWORKMODULES="$COMMONMODULES nfs 3c59x 
+NETWORKMODULES="$COMMONMODULES 3c59x 
 	       e100 tulip 8139too"
 #	       sis900 e100 hp100 natsemi pcnet32"
 
@@ -106,18 +106,6 @@ PCMCIAMAINMODULES="$COMMONMODULES nfs $IDEMODS $SCSIMODS"
 # images we only want on the CD (usually for space reasons)
 ISOLINUXMODULES="ehci-hcd ieee1394 ohci1394 sbp2"
 
-echo "Building dosutils/autoboot/initrd.img"
-makeinitrd --initrdto $TOPDESTPATH/dosutils/autoboot/initrd.img \
-	   --initrdsize 2750 \
-	   --loaderbin loader-local \
-	   --modules "$LOCALMODULES"
-
-echo "Building images/pxeboot/initrd.img"
-makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
-	   --initrdsize 2750 \
-	   --loaderbin loader-network \
-	   --modules "$NETWORKMODULES"
-
 # XXX hack hack
 PCMCIAMODULES_EXCLUDED="
 	apa1480_cb
@@ -145,69 +133,40 @@ do
 done
 PCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
 
-echo "Building images/initrd-pcmcia.img"
-makeinitrd --initrdto $TOPDESTPATH/images/initrd-pcmcia.img \
-	   --pcmcia \
+echo "Building $TOPDESTPATH/images/pxeboot/initrd.img"
+makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
 	   --initrdsize 2750 \
-	   --loaderbin loader-pcmcia \
-	   --modules "$PCMCIAMAINMODULES"
+	   --loaderbin loader \
+	   --modules "$COMMONMODULES"
+
+echo "Building initrd-everything.img"
+makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+	   --pcmcia \
+	   --initrdsize 5000 \
+	   --loaderbin loader \
+	   --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
 [ $? = 0 ] || exit 1
 
-TIER1LANGS="de_DE|fr_FR|it_IT|es_ES|ja_JP"
-for I in $BOOTDISKDIR; do
-#for I in $BOOTDISKDIR `find $BOOTDISKDIR -type d | egrep "($TIER1LANGS)"`; do
-    BOOTLANG=`basename $I`
-    BOOTDIR=`basename $I | cut -d'_' -f1`
-
-    if [ $BOOTLANG = "boot" ]; then
-	BOOTLANG=""
-	BOOTDIR=""
-    fi
-
-    echo "Building $BOOTDIR/boot.img"
-    makebootdisk --kernelto $TOPDESTPATH/dosutils/autoboot/vmlinuz  \
-		 --bootdisksize 1440 \
-		 --imagename $BOOTDIR/boot.img \
-		 --initrd $TOPDESTPATH/dosutils/autoboot/initrd.img
-    [ $? = 0 ] || exit 1
-
-    echo "Building $BOOTDIR/bootnet.img"
-    makebootdisk --kernelto $TOPDESTPATH/images/pxeboot/vmlinuz  \
-		 --bootdisksize 1440 \
-		 --imagename $BOOTDIR/bootnet.img \
-		 --initrd $TOPDESTPATH/images/pxeboot/initrd.img
-    [ $? = 0 ] || exit 1
-
-    echo "Building $BOOTDIR/pcmcia.img"
-    makebootdisk --imagename $BOOTDIR/pcmcia.img \
-	         --bootdisksize 1440 \
-		 --initrd $TOPDESTPATH/images/initrd-pcmcia.img
-    [ $? = 0 ] || exit 1
-done
+echo "Building 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/initrd-pcmcia.img
+rm -f $TOPDESTPATH/images/pxeboot/initrd.img
 
 echo "Building drvblock.img"
-makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "+scsi"
-[ $? = 0 ] || exit 1
+makedriverdisk --padsize 1440 "Supplemental Block Device Drivers" "drvblock" "=scsi"
+# JKFIXME: was exit 1
+[ $? = 0 ] || echo "ERROR: failed to write drvblock" 
 echo "Building drvnet.img"
-makedriverdisk --padsize 1440 "Supplemental Network Drivers" "drvnet" "+net"
-[ $? = 0 ] || exit 1
+makedriverdisk --padsize 1440 "Supplemental Network Drivers" "drvnet" "=net"
+[ $? = 0 ] || echo "ERROR: failed to write drvnet"
 
 echo "Building pcmciadd.img"
 makedriverdisk --padsize 1440 "PCMCIA Driver Diskette" "pcmciadd" "$PCMCIAMODULES"
-[ $? = 0 ] || exit 1
-
-unset BOOTLANG
-unset BOOTDIR
-
-echo "Building initrd-everything.img"
-makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
-	   --pcmcia \
-	   --initrdsize 5000 \
-	   --loaderbin loader-pcmcia \
-	   --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
-[ $? = 0 ] || exit 1
+[ $? = 0 ] || echo "ERROR: failed to write pcmciadd" 
 
 if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
 	echo "Building isolinux directory"