another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

9 files changed, 409 insertions, 286 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 6b74c1849..6fe22fc6a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -33,7 +33,13 @@ TOPDIR=$(cd $TOPDIR; pwd)
     MODDEPS=$KERNELROOT/moddeps
     BUILDARCH=$4
 
-    KERNELNAME=vmlinuz
+    if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
+	KERNELNAME=vmlinux
+	KERNELARCH=ppc64
+    else
+	KERNELNAME=vmlinuz
+	KERNELARCH=$BUILDARCH
+    fi
     
     if [ "$BUILDARCH" = "sparc64" ]; then
 	BASEARCH=sparc
@@ -41,6 +47,16 @@ TOPDIR=$(cd $TOPDIR; pwd)
 	BASEARCH=$BUILDARCH
     fi
 
+    # explicit block size setting for some arches (FIXME: we compose 
+    # ppc64-ish trees as ppc, so we have to set the "wrong" block size)
+    if [ "$BUILDARCH" = "sparc64" ]; then
+	CRAMBS="--blocksize 8192"
+    elif [ "$BUILDARCH" = "sparc" ]; then
+	CRAMBS="--blocksize 4096"
+    else
+	CRAMBS=""
+    fi
+
     if [ ! -d "$1" ]; then
 	LATEST="rsh porkchop latest --arch $BUILDARCH"
     else
@@ -109,7 +125,7 @@ findPackage() {
     dir=$1
     name=$2
     
-    for n in $dir/$name*{${BUILDARCH},noarch}.rpm; do
+    for n in $dir/$name*{${KERNELARCH},noarch}.rpm; do
 	thisName=$(rpm --qf '%{NAME}' -qp $n)
 	if [ -z "$thisName" ]; then
 	    continue
@@ -173,7 +189,11 @@ getmoddeps () {
     what=$1
     final=$2
 
-    egrep $(echo $what | sed 's/\.o  */|^/g;s/\.o$//') $MODDEPS > $final
+    for mod in $what ; do
+	mod=$(echo $mod | sed 's/\.o  */|^/g;s/\.o$//;s/.*\///')
+	egrep $mod $MODDEPS >> $final.foo
+    done
+    mv $final.foo $final
 }
 
 padfile () {
@@ -194,10 +214,14 @@ intcopymodules () {
             echo "Module $n not found in kernel rpm" >&2
         else 
 	    echo $n >> $MODULESUSED
-	    echo $n
-	    if ! cp $m $dir ; then
-		echo "Failed to copy $m to $dir (for module $n)"
-	    fi
+	    for o in $m ; do 
+		echo $n
+		ver=$(echo $o |cut -d / -f 6)
+		if ! [ -d $dir/$ver ] ; then mkdir $dir/$ver ; fi
+		if ! cp $o $dir/$ver; then
+		    echo "Failed to copy $o to $dir/$ver (for module $n)" >&2
+		fi
+	    done
         fi
     done
 }
@@ -286,19 +310,16 @@ makemoduleball() {
     $MODLIST --modinfo-file $MODINFO --ignore-missing --modinfo \
 	$MMB_MODULESET > ../$MMB_MODINFO
 
-    getmoddeps "*.o" ../modules.dep
+    getmoddeps "$(find . -name *.o)" ../modules.dep
 
     # create the pcitable
-    $TRIMPCITABLE *.o < $PCITABLE > ../pcitable
+    $TRIMPCITABLE $(find . -name *.o -exec basename {} \;) < $PCITABLE > ../pcitable
 
     if [ -n "$MMB_DD" ]; then
 	echo $MMB_DD > $MMB_DIR/rhdd-6.1
     fi
 
-    mkdir $version
-    mv *.o $version
-
-    find $version -type f | cpio --quiet -H crc -o | gzip -9 > ../$MMB_NAME
+    find . -type f | cpio --quiet -H crc -o | gzip -9 > ../$MMB_NAME
     cd ..
     rm -rf modules
     chmod 644 *
@@ -509,6 +530,8 @@ EOF
 	$MBD_DIR nst0 c 9 128 666 root:root
 	$MBD_DIR random c 1 8 644 root:root
 	$MBD_DIR urandom c 1 9 644 root:root
+	$MBD_DIR nvram c 10 144 644 root:root
+	$MBD_DIR adb c 56 0 644 root:root
 EOF
     ln -s fb0 $MBD_DIR/dev/fb
 
@@ -674,7 +697,8 @@ makeinstimage () {
     makemoduleball $tmpdir/modules "$modlist"
     makeproductfile $tmpdir
 
-    mkcramfs $tmpdir $INSTIMGPATH/${imagename}2.img
+    echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img"
+    mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img
     size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}')
     size=$(expr $size / 1024)
     echo "Wrote $INSTIMGPATH/${imagename}2.img (${size}k)..."
@@ -719,7 +743,8 @@ makemainimage () {
         rmdir $mmi_mntpoint
     elif [ $type = "cramfs" ]; then
         makeproductfile $IMGPATH
-        mkcramfs $IMGPATH $mmi_tmpimage
+        echo "Running mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage"
+        mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage
         SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
     fi
     
@@ -797,10 +822,22 @@ makedriverdisk () {
     fi
 }
 
+# source the architecture specific mk-images file so we can call functions
+# in it
+if [ ${BUILDARCH} = s390x ]; then
+    # FIXME: this is a bad hack for s390, but better than copying for now
+    source $TOPDIR/mk-images.s390
+else
+    source $TOPDIR/mk-images.${BUILDARCH}
+fi
+
 # Find the kernel, unpack it, and verify it
 vertag="BOOT"
 if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then
-    vertag="BOOT BOOTtape"
+    vertag="dummyvar tape"
+fi
+if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
+    vertag="pseries iseries"
 fi
 for kernelvers in $vertag; do
     kpackage=$($LATEST $KERNELPATH kernel-$kernelvers)
@@ -845,13 +882,14 @@ for kernelvers in $vertag; do
 
     rundepmod "$allmods" $MODDEPS
     rm -f $MODDEPS.foo
+    find $KERNELROOT/lib/modules/$version > $CACHE
 
-  # this is a bad hack, but better than copying for now
-  if [ ${BUILDARCH} = s390x ]; then
-      . $TOPDIR/mk-images.s390
-  else
-      . $TOPDIR/mk-images.${BUILDARCH}
-  fi
+    # make the boot images
+    makeBootImages
+done
 
+# make the second stage
+find $KERNELROOT/lib/modules/ > $CACHE
+makeSecondStage
 rm -rf $KERNELROOT
-done
+
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index c6395684c..ea8569c0e 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -40,12 +40,12 @@ EOF
 	mount -o loop -t ext2 $MBD_TMPIMAGE $MBD_BOOTTREE
 }
 
+makeBootImages() {
+    mkdir -p $TOPDESTPATH/boot
+    cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
 
-mkdir -p $TOPDESTPATH/boot
-cp $BOOTDISKDIR/bootlx $TOPDESTPATH/boot
-
-mkdir -p $TOPDESTPATH/etc
-cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
+    mkdir -p $TOPDESTPATH/etc
+    cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
 #
 # Red Hat Linux/Alpha aboot configuration options:
 #
@@ -61,47 +61,37 @@ cat > $TOPDESTPATH/etc/aboot.cfg <<EOF
 
 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
-
+    makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.img \
+	--initrdsize 4096 \
+	--padsize 1440 \
+	--loaderbin loader \
+	--modules "$NETMODULES $SCSIMODULES"
 
-makemainmodules "$SECSTAGE"
-makeinstimage "netstg" "$SECSTAGE"
-makeinstimage "hdstg" "$SECSTAGE"
-makemainimage "stage2" "cramfs "
+    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 $TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm ]; then
-    K24_PKG=$TOPDESTPATH/preview/RPMS/kernel-2.4.0-*.alpha.rpm
-    K24_DIR=/tmp/kernel24.dir.$$
-    mkdir -p $K24_DIR
-    rpm2cpio $K24_PKG | (cd $K24_DIR; cpio --quiet -iumd ./boot/vmlinuz-*)
-    cp $K24_DIR/boot/vmlinuz-* $TOPDESTPATH/kernels/vmlinuz.24
-    rm -rf $K24_DIR
-fi
 
+    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
 
-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"
-
+    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 1c2daa3cf..babfbe99f 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -140,43 +140,44 @@ PCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
 # need to make sure the base modules are included
 PCMCIAMODULES="$PCMCIAMODULES yenta_socket i82365 tcic pcmcia_core ds"
 
-echo "Building $TOPDESTPATH/images/pxeboot/initrd.img"
-makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
-           --pcmcia \
-	   --initrdsize 4750 \
-	   --loaderbin loader \
-	   --modules "$COMMONMODULES"
-
-echo "Building initrd-everything.img"
-makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
-	   --pcmcia \
-	   --initrdsize 7000 \
-	   --loaderbin loader \
-	   --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
-[ $? = 0 ] || exit 1
-
-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/pxeboot/initrd.img
-
-echo "Building drvblock.img"
-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 ] || echo "ERROR: failed to write drvnet"
-
-echo "Building pcmciadd.img"
-makedriverdisk --padsize 1440 "PCMCIA Driver Diskette" "pcmciadd" "$PCMCIAMODULES"
-[ $? = 0 ] || echo "ERROR: failed to write pcmciadd" 
-
-if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
+makeBootImages() {
+    echo "Building $TOPDESTPATH/images/pxeboot/initrd.img"
+    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \
+	--pcmcia \
+	--initrdsize 4750 \
+	--loaderbin loader \
+	--modules "$COMMONMODULES"
+
+    echo "Building initrd-everything.img"
+    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+	--pcmcia \
+	--initrdsize 7000 \
+	--loaderbin loader \
+	--modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
+    [ $? = 0 ] || exit 1
+
+    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/pxeboot/initrd.img
+
+    echo "Building drvblock.img"
+    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 ] || echo "ERROR: failed to write drvnet"
+
+    echo "Building pcmciadd.img"
+    makedriverdisk --padsize 1440 "PCMCIA Driver Diskette" "pcmciadd" "$PCMCIAMODULES"
+    [ $? = 0 ] || echo "ERROR: failed to write pcmciadd" 
+
+    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
@@ -187,26 +188,12 @@ if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
 
 	# isolinux needs the config file to be isolinux.cfg
 	mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg
-else
+    else
 	echo "No isolinux binaries.  Skipping isolinux creation"
-fi
+    fi
 
-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
-
-# clean up time -- being very explicit about what's linked
-if [ -f $TOPDESTPATH/isolinux/vmlinuz -a -f $TOPDESTPATH/isolinux/initrd.img ] ;then
+    # clean up time -- being very explicit about what's linked
+    if [ -f $TOPDESTPATH/isolinux/vmlinuz -a -f $TOPDESTPATH/isolinux/initrd.img ] ;then
 	echo "Cleaning up images"
 	# links for the pxeboot bits
 	rm -f $TOPDESTPATH/images/pxeboot/*
@@ -218,15 +205,15 @@ if [ -f $TOPDESTPATH/isolinux/vmlinuz -a -f $TOPDESTPATH/isolinux/initrd.img ] ;
 	mkdir -p $TOPDESTPATH/dosutils/autoboot/
 	ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/dosutils/autoboot/vmlinuz
 	ln $TOPDESTPATH/isolinux/initrd.img $TOPDESTPATH/dosutils/autoboot/initrd.img
-fi
-
-# now make a boot iso
-mkdir -p $TOPDESTPATH/images/isopath
-cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
-mkisofs -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 -T $TOPDESTPATH/images/isopath
-rm -rf $TOPDESTPATH/images/isopath
-	
-cat > $TOPDESTPATH/images/pxeboot/README <<EOF
+    fi
+
+    # now make a boot iso
+    mkdir -p $TOPDESTPATH/images/isopath
+    cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
+    mkisofs -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 -T $TOPDESTPATH/images/isopath
+    rm -rf $TOPDESTPATH/images/isopath
+    
+    cat > $TOPDESTPATH/images/pxeboot/README <<EOF
 The files in this directory are useful for booting a machine via PXE.  
 
 The following files are available:
@@ -234,3 +221,20 @@ vmlinuz - the BOOT kernel used for the installer
 initrd.img - an initrd with support for all install methods and
     drivers supported for installation of Red Hat Linux
 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
+}
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index a03180d30..3b6e31a92 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -32,21 +32,25 @@ EOF
 	cp $MBD_BOOTTREE/EFI/boot/* $MBD_BOOTTREE/
 }
 
-makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
-	     --imagename boot.img \
-	     --bootdisksize 20480 \
-	     --initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
+makeBootImages() {
+    makebootdisk --kernelto $TOPDESTPATH/kernels/vmlinuz  \
+	--imagename boot.img \
+	--bootdisksize 20480 \
+	--initrdflags '--initrdto $TOPDESTPATH/images/ramdisk.img \
 		     	    --initrdsize 8192 \
 			    --loaderbin loader \
 			    --modules "nfs fat vfat cramfs $USBMODS $NETMODULES $SCSIMODULES $IDEMODULES"' 
 
-makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES"
-makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES"
-makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES"
-makemainimage "stage2" "cramfs"
+    # now make a boot iso
+    mkdir -p $TOPDESTPATH/images/isopath
+    cp -l $TOPDESTPATH/images/boot.img $TOPDESTPATH/images/isopath
+    mkisofs -o $TOPDESTPATH/images/boot.iso -b boot.img -no-emul-boot -R -J -V -T $TOPDESTPATH/images/isopath
+    rm -rf $TOPDESTPATH/images/isopath
+}
 
-# now make a boot iso
-mkdir -p $TOPDESTPATH/images/isopath
-cp -l $TOPDESTPATH/images/boot.img $TOPDESTPATH/images/isopath
-mkisofs -o $TOPDESTPATH/images/boot.iso -b boot.img -no-emul-boot -R -J -V -T $TOPDESTPATH/images/isopath
-rm -rf $TOPDESTPATH/images/isopath
+makeSecondStage() {
+    makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES"
+    makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES"
+    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES"
+    makemainimage "stage2" "cramfs"
+}
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index aff51e322..43b66ac0e 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -1,18 +1,73 @@
-SECSTAGE="nfs fat vfat raid0 raid1 raid5 ext3"
-NETMODULES="pcnet32 tulip yellowfin acenic"
-SCSIMODULES=""
+FSMODS="msdos vfat ext3 reiserfs jfs"
+IDEMODS="ide-cd"
+SCSIMODS="sd_mod sr_mod st"
+LATEUSBMODS="mousedev usb-storage"
+SECSTAGE="raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
+# need yellowfin for IBM?
+NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too
+	   de4x5 acenic pcnet32 tulip natsemi eepro100 airport"
+
+SCSIMODULES="advansys aic7xxx initio sym53c8xx"
+
+# images we only want on the CD (usually for space reasons)
+ISOMODULES="ehci-hcd ieee1394 ohci1394 sbp2"
 
 prepareBootImage() {
     mkdir -p $TOPDESTPATH/ppc/chrp
+    mkdir -p $TOPDESTPATH/images
 }
 
-makeinitrd --initrdto $TOPDESTPATH/ppc/chrp/ramdisk.image.gz \
-           --initrdsize 8192 \
-           --loaderbin loader \
-           --modules "nfs fat vfat $NETMODULES $SCSIMODULES"
+makeBootImages() {
+    echo "Building boot images for kernel $kernelvers"
+
+    if [ "$kernelvers" = "pseries" ]; then
+	echo "Building pSeries initrd"
+	makeinitrd --initrdto $TOPDESTPATH/ppc/chrp/ramdisk.image.gz \
+	    --initrdsize 8192 \
+	    --loaderbin loader \
+	    --modules "nfs fat vfat cramfs $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+
+	mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp
+	cp $KERNELROOT/boot/vmlinux-*pseries* $TOPDESTPATH/ppc/chrp/vmlinux
+	cp $BOOTDISKDIR/yaboot.conf $TOPDESTPATH/etc/yaboot.conf
+	cp $BOOTDISKDIR/bootinfo.txt $TOPDESTPATH/ppc/bootinfo.txt
+	cp $IMGPATH/usr/lib/yaboot/yaboot $TOPDESTPATH/ppc/chrp
+
+	# we also want to make a boot.iso here 
+	mkdir -p $TOPDESTPATH/isopath/ppc/chrp $TOPDESTPATH/isopath/etc
+	cp $TOPDESTPATH/etc/* $TOPDESTPATH/isopath/etc/
+	cp $TOPDESTPATH/ppc/chrp/* $TOPDESTPATH/isopath/ppc/chrp
 
-makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES"
-makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES"
-makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES"
-makemainimage "stage2" "cramfs"
+	# FIXME: still need the magic boot_image file
+	# mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -V "PBOOT" -J -R -v -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath
+	# rm -rf $TOPDESTPATH/isopath/
+    elif [ "$kernelvers" = "iseries" ]; then
+	mkdir -p $TOPDESTPATH/ppc/iSeries
 
+	echo "Building iSeries initrd"
+	makeinitrd --initrdto $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz \
+	    --initrdsize 8192 \
+	    --loaderbin loader \
+	    --modules "nfs fat vfat cramfs veth $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+
+	cp $KERNELROOT/boot/vmlinux-*iseries* $TOPDESTPATH/ppc/iSeries/vmlinux
+	cp $KERNELROOT/boot/System.map-*iseries* $TOPDESTPATH/ppc/iSeries/System.map
+	
+	$IMGPATH/usr/sbin/addRamDisk $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz $TOPDESTPATH/ppc/iSeries/System.map $TOPDESTPATH/ppc/iSeries/vmlinux $TOPDESTPATH/ppc/iSeries/boot.img
+    else
+	echo "Unknown kernel version: $kernelvers"
+    # mac?
+    # echo "Building Mac initrd"
+    # makeinitrd --initrdto $TOPDESTPATH/images/ramdisk.image.gz \
+    #            --initrdsize 8192 \
+    #            --loaderbin loader \
+    #            --modules "nfs fat vfat cramfs $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+    fi
+}
+
+makeSecondStage() {
+    makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES"
+    makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES"
+    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES"
+    makemainimage "stage2" "cramfs"
+}
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 6cd826a7a..772e8d571 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -1,5 +1,3 @@
-
-
 prepareBootImage() {
         dd if=/dev/zero bs=1k count=$BOOTDISKSIZE of=/$MBD_TMPIMAGE 2>/dev/null
 	mount -o loop -t msdos $MBD_TMPIMAGE $MBD_BOOTTREE
@@ -111,6 +109,9 @@ makeS390initrd() {
     mkdir -p $MBD_DIR/tmp
     mkdir -p $MBD_DIR/etc/terminfo/{a,d,k,l,s,v,x}
     mkdir -p $MBD_DIR/var/state
+    mkdir -p $MBD_DIR/var/empty/sshd
+    mkdir -p $MBD_DIR/etc/{pam.d,security}
+    mkdir -p $MBD_DIR/$LIBDIR/security
     ln -s /tmp $MBD_DIR/var/state/xkb
 
     if [ -n "$LOADERMODULES" ]; then
@@ -123,23 +124,43 @@ root::0:0:root:/:/bin/bash
 sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin
 EOF
     echo "sshd:x:74:" >> $MBD_DIR/etc/group
-    mkdir -p $MBD_DIR/var/empty/sshd $MBD_DIR/etc/pam.d $MBD_DIR/lib/security \
-         $MBD_DIR/etc/security $MBD_DIR/$LIBDIR/security
     chmod 111 $MBD_DIR/var/empty/sshd
     for i in pam_stack.so pam_nologin.so pam_limits.so pam_console.so \
-         pam_securetty.so pam_env.so pam_unix.so pam_deny.so pam_cracklib.so \
+         pam_env.so pam_unix.so pam_deny.so \
          pam_limits.so; do
        cp -f $IMGPATH/$LIBDIR/security/$i $MBD_DIR/$LIBDIR/security
     done
     cp -f $IMGPATH/$LIBDIR/libpam_misc.so* $IMGPATH/$LIBDIR/libpam.so* $MBD_DIR/$LIBDIR
-    for i in sshd login system-auth other; do 
+    for i in sshd other; do 
        cp -f $IMGPATH/etc/pam.d/$i $MBD_DIR/etc/pam.d
     done
+    cat > $MBD_DIR/etc/pam.d/login << EOF
+#%PAM-1.0
+auth       required     pam_securetty.so
+auth       required     pam_stack.so service=system-auth
+auth       required     pam_nologin.so
+account    required     pam_stack.so service=system-auth
+password   required     pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth
+session    optional     pam_console.so
+EOF
+    cat > $MBD_DIR/etc/pam.d/system-auth << EOF
+#%PAM-1.0
+auth        required      pam_env.so
+auth        sufficient    pam_unix.so likeauth nullok
+auth        required      pam_deny.so
+account     required      pam_unix.so
+password    sufficient    pam_unix.so nullok use_authtok md5 shadow
+password    required      pam_deny.so
+session     required      pam_limits.so
+session     required      pam_unix.so
+EOF
     cp -f $IMGPATH/etc/security/{limits.conf,pam_env.conf} $MBD_DIR/etc/security/
     cp -f $IMGPATH/usr/bin/login $MBD_DIR/sbin/login
     cp -f $IMGPATH/usr/sbin/sshd $MBD_DIR/sbin/sshd
 
     install -s -m 755 $LOADERBINDIR/$LOADERBIN $MBD_DIR/sbin/loader
+    install -s -m 755 $LOADERBINDIR/shutdown $MBD_DIR/sbin/shutdown
     #install -s -m 755 $LOADERBINDIR/load_anaconda $MBD_DIR/sbin/loader
     # install -m 644 $KEYMAPS $MBD_DIR/etc/keymaps.gz
     # install -m 644 $FONTS $MBD_DIR/etc/fonts.cgz
@@ -177,11 +198,10 @@ EOF
     cp -f $IMGPATH/usr/bin/gawk $MBD_DIR/sbin/awk
     cp -f $IMGPATH/usr/bin/sort_save $MBD_DIR/sbin/sort
     cp -f $IMGPATH/usr/sbin/chroot $MBD_DIR/sbin/chroot
-    cp -f $IMGPATH/usr/sbin/consoletype $MBD_DIR/sbin/consoletype
     cp -f $IMGPATH/usr/sbin/mke2fs $MBD_DIR/sbin/mke2fs
     cp -f $IMGPATH/usr/bin/busybox $MBD_DIR/sbin/busybox
     for i in cp uname tee rm ps mv more mkdir ls ln hostname head \
-             gzip grep dd chmod cat; do
+             lsmod gzip grep dd chmod cat; do
        ln -sf busybox $MBD_DIR/sbin/$i
     done
     cp -f $IMGPATH/usr/X11R6/bin/xauth $MBD_DIR/sbin/xauth
@@ -202,6 +222,18 @@ EOF
     cp -f $IMGPATH/usr/sbin/ifconfig $MBD_DIR/sbin/ifconfig
     cp -f $IMGPATH/usr/sbin/xinetd $MBD_DIR/sbin/xinetd
     cp -f $IMGPATH/usr/sbin/in.telnetd $MBD_DIR/sbin/in.telnetd
+    cat > $MBD_DIR/etc/xinetd.d/telnet <<EOF
+service telnet
+{
+        flags           = REUSE
+        socket_type     = stream
+        wait            = no
+        user            = root
+        server          = /sbin/in.telnetd
+        log_on_failure  += USERID
+        disable         = no
+}
+EOF
     cp -f $IMGPATH/usr/sbin/route $MBD_DIR/sbin/route
     cp -f $IMGPATH/usr/sbin/portmap $MBD_DIR/sbin/portmap
     cp -f $IMGPATH/etc/xinetd.conf $MBD_DIR/etc/xinetd.conf
@@ -210,21 +242,20 @@ EOF
     echo -n "Generating SSH1 RSA host key: "
     /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \
                         -C '' -N '' >&/dev/null
-    chmod 600 $MBD_DIR/etc/ssh/ssh_host_key
-    chmod 644 $MBD_DIR/etc/ssh/ssh_host_key.pub
     echo
     echo -n "Generating SSH2 RSA host key: "
     /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \
                         -C '' -N '' >&/dev/null
-    chmod 600 $MBD_DIR/etc/ssh/ssh_host_rsa_key
-    chmod 644 $MBD_DIR/etc/ssh/ssh_host_rsa_key.pub
     echo
     echo -n "Generating SSH2 DSA host key: "
     /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \
                         -C '' -N '' >&/dev/null
-    chmod 600 $MBD_DIR/etc/ssh/ssh_host_dsa_key
-    chmod 644 $MBD_DIR/etc/ssh/ssh_host_dsa_key.pub
     echo
+pwd
+    (cd $MBD_DIR/etc/ssh; \
+        chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \
+        chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; )
+pwd
     cat > $MBD_DIR/etc/ssh/sshd_config <<EOF
 Port 22
 HostKey /etc/ssh/ssh_host_key
@@ -244,11 +275,13 @@ RSAAuthentication yes
 PasswordAuthentication yes
 PermitEmptyPasswords yes
 EOF
+    chmod 600 $MBD_DIR/etc/ssh/sshd_config
 
     for file in ISO8859-15.so EUC-JP.so libJIS.so gconv-modules; do
        cp -f $IMGPATH/usr/$LIBDIR/gconv/$file $MBD_DIR/usr/$LIBDIR/gconv/$file
     done
-    cp -f $IMGPATH/etc/services $MBD_DIR/etc/
+    echo "telnet          23/tcp" > $MBD_DIR/etc/services 
+    echo "tcp     6       TCP" > $MBD_DIR/etc/protocols
     cp -df $IMGPATH/$LIBDIR/libpam.so* $MBD_DIR/$LIBDIR
     cp -df $IMGPATH/$LIBDIR/libdl.so* $MBD_DIR/$LIBDIR
     cp -df $IMGPATH/$LIBDIR/libdl-*.so* $MBD_DIR/$LIBDIR
@@ -279,7 +312,6 @@ EOF
     cp -df $IMGPATH/$LIBDIR/libssl* $MBD_DIR/$LIBDIR
     cp -df $IMGPATH/$LIBDIR/libext2* $MBD_DIR/$LIBDIR
     cp -df $IMGPATH/$LIBDIR/libcom_err* $MBD_DIR/$LIBDIR
-    cp -df $IMGPATH/$LIBDIR/libcrack* $MBD_DIR/$LIBDIR
     cp -df $IMGPATH/usr/kerberos/$LIBDIR/libgssapi_krb5* $MBD_DIR/usr/kerberos/$LIBDIR
     cp -df $IMGPATH/usr/kerberos/$LIBDIR/libkrb5.so* $MBD_DIR/usr/kerberos/$LIBDIR
     cp -df $IMGPATH/usr/kerberos/$LIBDIR/libk5crypto.so* $MBD_DIR/usr/kerberos/$LIBDIR
@@ -300,7 +332,7 @@ EOF
            printf("chmod %s %s/dev/%s\n", $6, $1, $2);
            printf("chown %s %s/dev/%s\n", $7, $1, $2);
          }' <<EOF | sh
-        $MBD_DIR console c 4 64 600 root:root
+        $MBD_DIR console c 5 1 600 root:root
         $MBD_DIR random c 1 8 644 root:root
         $MBD_DIR ram0 b 1 1 640 root:root
         $MBD_DIR ram1 b 1 2 640 root:root
@@ -333,8 +365,6 @@ EOF
         $MBD_DIR ttyp7 c 3 7 644 root:root
         $MBD_DIR ttyp8 c 3 8 644 root:root
         $MBD_DIR ttyp9 c 3 9 644 root:root
-        $MBD_DIR fd0 b 2 0 644 root:root
-        $MBD_DIR fd1 b 2 1 644 root:root
 EOF
     ln -s ram1 $MBD_DIR/dev/ram
     for i in `seq 2 9`; do
@@ -404,41 +434,31 @@ COMMONMODULES="loop cramfs dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod tap
 LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS"
 NETWORKMODULES="$COMMONMODULES nfs ctc netiucv ipv6"
 
-echo "In mk-images.s390: kernelvers is $kernelvers"
-if [ "$kernelvers" = "BOOT" ]; then
-    makeS390initrd --initrdto $TOPDESTPATH/images/initrd.img \
-	   --initrdsize 15000 \
-	   --loaderbin loader \
-	   --modules "$NETWORKMODULES"
-    cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
-fi
-
-if [ "$kernelvers" = "BOOTtape" ]; then
-    makeS390initrd --initrdto $TOPDESTPATH/images/tapeinrd.img \
-	   --initrdsize 15000 \
-	   --loaderbin loader \
-	   --modules "$NETWORKMODULES"
-    cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img
-fi
-
-for I in `find $BOOTDISKDIR -type d`; do
-    BOOTLANG=`basename $I`
-    BOOTDIR=`basename $I | cut -d'_' -f1`
+makeBootImages() {
+    echo "In mk-images.s390: kernelvers is $kernelvers"
+    if [ "$kernelvers" = "" ]; then
+	makeS390initrd --initrdto $TOPDESTPATH/images/initrd.img \
+	    --initrdsize 15000 \
+	    --loaderbin loader \
+	    --modules "$NETWORKMODULES"
+	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
+    fi
 
-    if [ $BOOTLANG = "boot" ]; then
-	BOOTLANG=""
-	BOOTDIR=""
+    if [ "$kernelvers" = "tape" ]; then
+	makeS390initrd --initrdto $TOPDESTPATH/images/tapeinrd.img \
+	    --initrdsize 15000 \
+	    --loaderbin loader \
+	    --modules "$NETWORKMODULES"
+	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/tapekrnl.img
     fi
-done
+}
 
-unset BOOTLANG
-unset BOOTDIR
+makeSecondStage() {
+    makemainmodules "=scsi =net $SECSTAGE"
 
-if [ "$kernelvers" = "BOOT" ]; then
-makemainmodules "=scsi =net $SECSTAGE"
+    makeinstimage "netstg" "=scsi $SECSTAGE"
 
-makeinstimage "netstg" "=scsi $SECSTAGE"
+    makeinstimage "hdstg" "=net $SECSTAGE"
+    makemainimage "stage2" "cramfs"
+}
 
-makeinstimage "hdstg" "=net $SECSTAGE"
-makemainimage "stage2" "cramfs"
-fi
diff --git a/scripts/mk-images.sparc64 b/scripts/mk-images.sparc64
index af993e12e..cb2f57a0e 100644
--- a/scripts/mk-images.sparc64
+++ b/scripts/mk-images.sparc64
@@ -52,47 +52,51 @@ maketftp() {
     $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
+    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
+    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
+    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
+    SCSIMODULES="qlogicpti sg st pluto fcal soc socal
              fc4 aic7xxx sym53c8xx qlogicisp"
-NETMODULES="sunhme sunqe sunbmac myri_sbus 3c59x de4x5" 
+    NETMODULES="sunhme sunqe sunbmac myri_sbus 3c59x de4x5" 
 
-makeinitrd --initrdto $TOPDESTPATH/boot/initrd64.img \
-	   --initrdsize 2000 \
-	   --loaderbin loader \
-           --modules "$SCSIMODULES $NETMODULES" \
-	   --moduleballname modules64.cgz
+    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
+    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 \
+    makebootdisk --kernelto $TOPDESTPATH/boot/vmlinux64.gz  \
+	--imagename boot64.img \
+	--bootdisksize 1440 \
+	--initrdflags '--initrdsize 2000 \
 			    --loaderbin loader-local \
 			    --modules "$SCSIMODULES" \
 			    --moduleballname modules64.cgz'
+}
 
-makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES" modules64.cgz
+makeSecondStage() {
+    makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES" modules64.cgz
 
-makeinstimage "netstg" "$SCSIMOUDLES $SECSTAGE"
-makeinstimage "hdstg" "$NETMODULES $SECSTAGE"
-makemainimage "stage2" "ext2"
+    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 65b584ca8..28f2548a9 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -83,15 +83,16 @@ PCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
 
 mkdir -p $TOPDESTPATH/images/pxeboot
 
-echo "Building initrd-everything.img"
-makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
-	   --pcmcia \
-	   --initrdsize 8192 \
-	   --loaderbin loader \
-	   --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
-[ $? = 0 ] || exit 1
-
-if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
+makeBootImages() {
+    echo "Building initrd-everything.img"
+    makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
+	--pcmcia \
+	--initrdsize 8192 \
+	--loaderbin loader \
+	--modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
+    [ $? = 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
@@ -102,26 +103,29 @@ if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
 
 	# isolinux needs the config file to be isolinux.cfg
 	mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg
-else
+    else
 	echo "No isolinux binaries.  Skipping isolinux creation"
-fi
+    fi
+
+    # now make a boot iso
+    mkdir -p $TOPDESTPATH/images/isopath
+    cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
+    mkisofs -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 -T $TOPDESTPATH/images/isopath
+    rm -rf $TOPDESTPATH/images/isopath
+}
 
-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
-
-# now make a boot iso
-mkdir -p $TOPDESTPATH/images/isopath
-cp -rl $TOPDESTPATH/isolinux $TOPDESTPATH/images/isopath
-mkisofs -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 -T $TOPDESTPATH/images/isopath
-rm -rf $TOPDESTPATH/images/isopath
+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/upd-instroot b/scripts/upd-instroot
index 6cda83c06..4569487e9 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -104,7 +104,7 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt slang
 	 bzip2-libs dosfstools pciutils reiserfs-utils parted sed
 	 busybox-anaconda rpm-python booty hdparm lvm
 	 rhpl pyxf86config libxml2 libxml2-python glib2
-	 elfutils-libelf bogl-bterm bogl krb5-libs convertdb1"
+	 elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES kernel-pcmcia-cs kernel-utils"
@@ -118,8 +118,12 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
     PACKAGES="$PACKAGES s390utils binutils libgcc tcp_wrappers
               sed net-tools xinetd openssl openssh openssh-server coreutils
               login initscripts XFree86-xauth bash portmap pam 
-              libcrack telnet-server login mount grep modutils gawk 
-              XFree86-libs"
+              telnet-server login mount grep modutils gawk 
+              XFree86-libs strace"
+fi
+
+if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
+    PACKAGES="$PACKAGES kernel-pcmcia-cs pdisk yaboot hfsutils"
 fi
 
 # xpm is missing
@@ -184,7 +188,7 @@ if [ $ARCH = ia64 ]; then
 fi
 
 if [ $ARCH = ppc ]; then
-    PACKAGESGR="$PACKAGESGR fbset"
+    PACKAGESGR="$PACKAGESGR fbset yaboot ppc64-utils"
 fi
 
 #
@@ -207,7 +211,7 @@ etc/group
 etc/passwd
 etc/protocols
 etc/services
-$LIBDIR/ld-*
+$LIBDIR/ld*.so*
 $LIBDIR/libc*
 $LIBDIR/libcom_err*
 $LIBDIR/libcrypt*
@@ -264,6 +268,7 @@ sbin/mkreiserfs
 sbin/mkraid
 sbin/mkswap
 sbin/parted
+sbin/pdisk
 sbin/pvchange
 sbin/pvcreate
 sbin/pvdata
@@ -293,6 +298,11 @@ sbin/vgsplit
 usr/X11R6/share/Xconfigurator/MonitorsDB
 usr/bin/python
 usr/bin/python2.2
+usr/bin/hmount
+usr/bin/humount
+usr/bin/hcopy
+usr/bin/hattrib
+usr/bin/hformat
 usr/lib/anaconda-runtime/*
 usr/lib/anaconda/*
 usr/lib/anaconda/installclasses/*
@@ -333,11 +343,17 @@ usr/$LIBDIR/python2.2/site-packages/rhpl
 usr/lib/rpm/macros
 usr/lib/rpm/rpmpopt
 usr/lib/rpm/rpmrc
+usr/lib/yaboot/addnote
+usr/lib/yaboot/ofboot
+usr/lib/yaboot/yaboot
 usr/libexec/convertdb1
 usr/share/locale/*/LC_MESSAGES/anaconda.mo
 usr/sbin/anaconda
 usr/sbin/ddcprobe
 usr/sbin/dmidecode
+usr/sbin/mkofboot
+usr/sbin/ofpath
+usr/sbin/ybin
 usr/share/anaconda/locale-list
 usr/share/anaconda/anaconda.conf
 usr/share/terminfo/b/bterm
@@ -356,6 +372,7 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
     cat >> $KEEPFILE <<EOF
 usr/share/terminfo/a/ansi
 usr/share/terminfo/d/dumb
+usr/share/terminfo/k/kterm
 usr/share/terminfo/s/screen
 usr/share/terminfo/v/vt100
 usr/share/terminfo/v/vt100-nav
@@ -364,22 +381,12 @@ usr/share/terminfo/x/xterm
 usr/share/terminfo/x/xterm-color
 usr/bin/strace
 usr/bin/ldd
-usr/bin/wget
-usr/bin/printf
-usr/bin/dasdformat
-usr/bin/formatmnt
-usr/bin/mountpoint
-usr/bin/netsetup
-usr/bin/pkgselect
-usr/bin/pkgsrc
 usr/sbin/chroot
 usr/sbin/sshd
 usr/sbin/glibc_post_upgrade
 usr/sbin/in.telnetd
 usr/sbin/xinetd
 sbin/busybox.anaconda
-sbin/consoletype
-sbin/rhsetup
 sbin/ifconfig
 sbin/route
 sbin/portmap
@@ -388,7 +395,6 @@ sbin/dasdfmt
 sbin/swapon
 sbin/swapoff
 sbin/mkswap
-sbin/tune2fs
 bin/bash
 bin/dd
 bin/gawk
@@ -399,7 +405,6 @@ bin/login
 bin/cat
 bin/chmod
 bin/sort
-bin/rpm
 $LIBDIR/libpam.so*
 $LIBDIR/libdl.so*
 $LIBDIR/libdl-*.so*
@@ -419,16 +424,12 @@ $LIBDIR/libresolv-*.so*
 $LIBDIR/libvtoc*.so*
 lib/modules/ibm/*
 etc/xinetd.conf
-etc/xinetd.d/telnet
 etc/pam.d/sshd
-etc/pam.d/login
-etc/pam.d/system-auth
 etc/pam.d/other
 etc/security/limits.conf
 etc/security/pam_env.conf
 lib/security
 $LIBDIR/security/pam_*
-usr/$LIBDIR/libcrack.so*
 usr/$LIBDIR/libwrap.so*
 usr/X11R6/$LIBDIR/libXmuu.so*
 usr/X11R6/$LIBDIR/libX11.so*
@@ -478,8 +479,10 @@ etc/man.config
 etc/pango/*
 etc/fonts/*
 $LIBDIR/libnss_dns*
+$LIBDIR/libnss_nis*
 $LIBDIR/libpam*
 $LIBDIR/libproc*
+sbin/addRamDisk
 sbin/debugfs
 sbin/e2fsck
 sbin/e2label
@@ -568,6 +571,7 @@ usr/$LIBDIR/pango/*
 usr/$LIBDIR/python2.2/site-packages/gtk*/gtk/*
 usr/$LIBDIR/rpm/rpmpopt
 usr/lib/syslinux/*
+usr/lib/yaboot/*
 usr/sbin/chroot
 usr/sbin/ddcprobe
 usr/sbin/fbset