Change the ISOs we build

Stop building boot.iso (and diskboot.img) in preference for building a
netinst.iso with the boot bits as well as the second stage.  This will
replace the rescue image and is overall far more useful

5 files changed, 31 insertions, 27 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index b8e7ea799..abcb066d5 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -100,6 +100,10 @@ if [ -z "$OUTPUT" ]; then
     usage
 fi
 
+if [ ! -d "$OUTPUT" ]; then
+    mkdir -p $OUTPUT
+fi
+
 yumconf=$(mktemp /tmp/yum.conf.XXXXXX)
 cat > $yumconf <<EOF
 [main]
diff --git a/scripts/mk-images b/scripts/mk-images
index 98659e5a8..49886ee90 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -32,6 +32,7 @@ usage () {
 NEEDGR=yes
 DEBUG=""
 BUILDARCH=`uname -m`
+BOOTISO="netinst.iso"
 
 while [ $# -gt 0 ]; do
     case $1 in
@@ -43,6 +44,10 @@ while [ $# -gt 0 ]; do
 	    DEBUG="--debug"
 	    shift
 	    ;;
+       --noiso)
+           BOOTISO=""
+           shift
+           ;;
 
 	--arch)
 	    BUILDARCH=$2
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 56fd8dc71..fa33f646d 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -145,12 +145,6 @@ makeBootImages() {
     mv $TOPDESTPATH/kernels/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
     rmdir $TOPDESTPATH/kernels
 
-    # make a boot iso
-    mkdir -p $TOPDESTPATH/images/isopath
-    cp -l $TOPDESTPATH/images/boot.img $TOPDESTPATH/images/isopath
-    mkisofs -quiet -o $TOPDESTPATH/images/boot.iso -b boot.img -no-emul-boot -R -J -V "$PRODUCT" -T $TOPDESTPATH/images/isopath
-    rm -rf $TOPDESTPATH/images/isopath
-
     # make a pxe dir with kernel + initrd
     cat > $TOPDESTPATH/images/pxeboot/README <<EOF
 The files in this directory are useful for booting a machine via PXE.  
@@ -164,7 +158,6 @@ EOF
 [images-$KERNELARCH]
 kernel = images/pxeboot/vmlinuz
 initrd = images/pxeboot/initrd.img
-boot.iso = images/boot.iso
 boot.img = images/boot.img
 
 __EOT__
@@ -186,3 +179,9 @@ initrd = images/xen/initrd.img
 __EOT__
   fi
 }
+
+doPostImages() {
+    if [ -n "$BOOTISO" ]; then
+        mkisofs -quiet -o $TOPDESTPATH/images/$BOOTISO -b boot.img -no-emul-boot -R -J -V "$PRODUCT" -T -graft-points boot.img=$TOPDESTPATH/images/boot.img images/stage2.img=$TOPDESTPATHimages/stage2.img
+    fi
+}
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 221673be6..6dd5d884f 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -114,7 +114,6 @@ __EOT__
 }
 
 doPostImages() {
-    # Create boot.iso here instead of above, so we can include it all
     mkdir -p $TOPDESTPATH/etc
     mkdir -p $TOPDESTPATH/ppc/chrp
 	
@@ -143,6 +142,10 @@ doPostImages() {
 	cp $TOPDESTPATH/ppc/ppc??/yaboot.conf $TOPDESTPATH/etc
     fi
 
+    if [ -z "$BOOTISO" ]; then
+	return
+    fi
+
     # Copy it all into the isopath for the boot CD
     mkdir -p $TOPDESTPATH/isopath
     cp -r $TOPDESTPATH/{ppc,etc} $TOPDESTPATH/isopath
@@ -165,11 +168,12 @@ doPostImages() {
     fi
 
     # Create the boot.iso
-    mkisofs -o $TOPDESTPATH/images/boot.iso -chrp-boot -U $PREPBOOT \
+    mkisofs -o $TOPDESTPATH/images/$BOOTISO -chrp-boot -U $PREPBOOT \
 	-part -hfs -T -r -l -J -A "$PRODUCT $VERSION" -sysid PPC \
 	-V "PBOOT" -volset "$VERSION" -volset-size 1 -volset-seqno 1 \
 	$MACBOOT \
 	-map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \
-	-no-desktop -allow-multidot $TOPDESTPATH/isopath
+	-no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath \
+	images/stage2.img=$TOPDESTPATH/images/stage2.img
     rm -rf $TOPDESTPATH/isopath
 }
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 5003fd7cd..f1522a6f0 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -122,21 +122,6 @@ makeBootImages() {
     # symlink the kernel for pxe dir
     ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
 
-    # now make a boot iso
-    mkdir -p $TOPDESTPATH/images/isopath
-    cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
-    mkisofs -quiet -o $TOPDESTPATH/images/boot.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -V "$PRODUCT" -T $TOPDESTPATH/images/isopath
-    rm -rf $TOPDESTPATH/images/isopath
-
-    # now make a boot pendrive image
-    mkdir -p $TOPDESTPATH/images/fobpath
-    dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null
-    cp -r $TOPDESTPATH/isolinux/* $TOPDESTPATH/images/fobpath/
-    grep -v local $TOPDESTPATH/images/fobpath/isolinux.cfg > $TOPDESTPATH/images/fobpath/syslinux.cfg
-    rm -f $TOPDESTPATH/images/fobpath/isolinux.cfg
-    /usr/bin/makebootfat -o $TOPDESTPATH/images/diskboot.img -Y -b /usr/share/syslinux/ldlinux.bss -m /usr/share/makebootfat/x86/mbrfat.bin -F -Z -c /usr/share/syslinux/ldlinux.sys $TOPDESTPATH/images/fobpath/
-    rm -rf $TOPDESTPATH/images/fobpath
-
     cat > $TOPDESTPATH/images/pxeboot/README <<EOF
 The files in this directory are useful for booting a machine via PXE.  
 
@@ -149,10 +134,9 @@ EOF
 [images-$BASEARCH]
 kernel = images/pxeboot/vmlinuz
 initrd = images/pxeboot/initrd.img
-boot.iso = images/boot.iso
-diskboot.img = images/diskboot.img
 
 __EOT__
+
   else # set up the boot stuff for the xen guest kernel
     echo "Building $KERNELARCH guest initrd.img"
     mkdir -p $TOPDESTPATH/images/xen
@@ -170,3 +154,11 @@ initrd = images/xen/initrd.img
 __EOT__
   fi
 }
+
+
+doPostImages() {
+    if [ -n "$BOOTISO" ]; then
+       mkisofs -quiet -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/stage2.img=$TOPDESTPATH/images/stage2.img
+    fi
+
+}