- copy over with anaconda-11.0.5

Changed files:
    anaconda-mk-images.i386 -> 1.2
    anaconda-scrubtree -> 1.2

diff --git a/anaconda-mk-images.i386 b/anaconda-mk-images.i386
index 1e06217363540892cc5f1e6146db9d4a036d2717..f5b632ef188d9a8fbc08a1bb429962bcccf007fa 100644 (file)
--- a/anaconda-mk-images.i386
+++ b/anaconda-mk-images.i386
@@ -1,4 +1,4 @@
-SYSLINUX=$IMGPATH/usr/bin/syslinux-nomtools
+SYSLINUX=$IMGPATH/usr/lib/syslinux/syslinux-nomtools
 
 if [ ! -f $SYSLINUX ]; then
   echo "Warning: nomtools syslinux doesn't exist"
@@ -11,7 +11,7 @@ fi
 
 prepareBootImage() {
         dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=/$MBD_TMPIMAGE 2>/dev/null
-       mkdosfs -r 32 -C $MBD_TMPIMAGE $BOOTDISKSIZE >/dev/null
+       mkdosfs -r 16 -C $MBD_TMPIMAGE $BOOTDISKSIZE >/dev/null
        $SYSLINUX $MBD_TMPIMAGE
        mount -o loop -t msdos $MBD_TMPIMAGE $MBD_BOOTTREE
 
@@ -26,7 +26,7 @@ prepareBootTree() {
        cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
        cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
 
-       pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss
+       $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh $BOOTDISKDIR/syslinux-splash.png $BOOTDISKDIR/splash.lss
        if [ $? != 0 ]; then
           echo $0: Failed to create splash.lss
           exit 1
@@ -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,91 +64,19 @@ 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 $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"
+  if [ "$kerneltag" != "xenU" ]; then
+    echo "Building $KERNELARCH initrd.img"
     makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
-       --pcmcia --nobogl \
-       --initrdsize 4750 \
+       --initrdsize 7000 \
        --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 \
-       --pcmcia \
-       --initrdsize 10000 \
-       --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
 
@@ -162,7 +90,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
@@ -210,21 +137,15 @@ vmlinuz - the BOOT kernel used for the installer
 initrd.img - an initrd with support for all install methods and
     drivers supported for installation of $PRODUCT
 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"
+  else # set up the boot stuff for the xen guest kernel
+    echo "Building $KERNELARCH guest initrd.img"
+    mkdir -p $TOPDESTPATH/images/xen
+    makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \
+       --initrdsize 7000 \
+       --loaderbin loader \
+       --modules "$INITRDMODS"
     [ $? = 0 ] || exit 1
+    cp $KERNELROOT/boot/vmlinuz-*xenU $TOPDESTPATH/images/xen/vmlinuz
+  fi
 }

diff --git a/anaconda-scrubtree b/anaconda-scrubtree
index e21fa94c5a40fd8943d44b0547d9c3a79c6cb0a3..16fcd16035a3bf543af628d3abba4afd3c00f6e4 100644 (file)
--- a/anaconda-scrubtree
+++ b/anaconda-scrubtree
@@ -46,7 +46,7 @@ rm $p/etc/ld.so.conf
 #
 # HOWEVER dont clobber existing programs supplied by other packages if exist
 #
-mv $p/sbin/busybox.anaconda $p/usr/bin/busybox
+mv $p/usr/sbin/busybox.anaconda $p/usr/bin/busybox
 (cd $p/usr/bin;
 set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
 dontclobber=(sh busybox reboot shutdown poweroff)