[PATCH 09/12] Step 3 of merging installer images: No longer create install.img.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 scripts/mk-images       |   66 -----------------------------------------------
 scripts/mk-images.alpha |    6 ----
 scripts/mk-images.ia64  |    2 +-
 scripts/mk-images.ppc   |    3 +-
 scripts/mk-images.sparc |    2 +-
 5 files changed, 3 insertions(+), 76 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index d51ac6f..39aed4c 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -419,67 +419,6 @@ makeinitrd() {
     fi
 }
 
-makemainimage () {
-    imagename=$1
-    type=$2
-    mmi_tmpimage=$TMPDIR/instimage.img.$$
-    mmi_mntpoint=$TMPDIR/instimage.mnt.$$
-
-    rm -rf $mmi_tmpimage $mmi_mntpoint
-    mkdir $mmi_mntpoint
-
-    if [ $type = "ext2" ]; then
-        SIZE=$(du -sk $IMGPATH | awk '{ print int($1 * 1.1) }')
-        if [ -d $IMGPATH/usr/share/anaconda]; then
-            ERROR=$(du -sk $IMGPATH/usr/share/anaconda | awk '{ print $1 }')
-            SIZE=$(expr $SIZE - $ERROR)
-        fi
-        if [ -d $IMGPATH/usr/share/syslinux ]; then
-            ERROR=$(du -sk $IMGPATH/usr/share/syslinux | awk '{ print $1 }')
-            SIZE=$(expr $SIZE - $ERROR)
-        fi
-        dd if=/dev/zero bs=1k count=${SIZE} of=$mmi_tmpimage 2>/dev/null
-        mke2fs -q -F $mmi_tmpimage > /dev/null
-        tune2fs -c0 -i0 $mmi_tmpimage >/dev/null
-        mount -o loop $mmi_tmpimage $mmi_mntpoint
-
-        (cd $IMGPATH; find . |
-            fgrep -v "./usr/share/anaconda" |
-            fgrep -v "./usr/share/syslinux"
-            cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd)
-        makeproductfile $mmi_mntpoint
-        umount $mmi_mntpoint
-        rmdir $mmi_mntpoint
-    elif [ $type = "squashfs" ]; then
-        makeproductfile $IMGPATH
-        echo "Running mksquashfs $IMGPATH $mmi_tmpimage -no-fragments -no-progress"
-        mksquashfs $IMGPATH $mmi_tmpimage -no-fragments -no-progress
-        chmod 0644 $mmi_tmpimage
-        SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
-    elif [ $type = "cramfs" ]; then
-        makeproductfile $IMGPATH
-        echo "Running mkcramfs $CRAMBS $IMGPATH $mmi_tmpimage"
-        mkfs.cramfs $CRAMBS $IMGPATH $mmi_tmpimage
-        SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
-    fi
-
-    cp $mmi_tmpimage $INSTIMGPATH/${imagename}.img
-    chmod 644 $INSTIMGPATH/${imagename}.img
-
-    echo "Wrote $INSTIMGPATH/${imagename}.img (${SIZE}k)"
-    relpath=${INSTIMGPATH#$TOPDESTPATH/}
-    echo "mainimage = ${relpath}/${imagename}.img" >> $TOPDESTPATH/.treeinfo
-
-    rm $mmi_tmpimage
-}
-
-makeSecondStage() {
-    echo "[stage2]" >> $TOPDESTPATH/.treeinfo
-    echo "Building install.img"
-    makemainimage "install" "squashfs"
-    [ $? = 0 ] || exit 1
-}
-
 doPostImages() {
    /bin/true
 }
@@ -596,11 +535,6 @@ for KERNELARCH in $arches; do
     done
 done
 
-if [ -n "$foundakernel" ]; then
-    makeSecondStage
-    rm -rf $KERNELBASE
-fi
-
 doPostImages
 
 cd $TOPDIR
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index 884eff4..7bb6696 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -117,9 +117,3 @@ EOF
 #    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 $NETMODULES $SCSIMODULES $IDEMODS =scsi =net"
-#     makemainimage "install" "cramfs"
-#}
-
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index b24a216..d11083b 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -154,7 +154,7 @@ __EOT__
 
 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/install.img=$TOPDESTPATH/images/install.img
+        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
         implantisomd5 $TOPDESTPATH/images/$BOOTISO
     fi
 }
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index a2820c4..a17af3c 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -168,8 +168,7 @@ doPostImages() {
 	-V "PBOOT" -volset "$VERSION" -volset-size 1 -volset-seqno 1 \
 	$MACBOOT \
 	-map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \
-	-no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath \
-	images/install.img=$TOPDESTPATH/images/install.img
+	-no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath
     implantisomd5 $TOPDESTPATH/images/$BOOTISO
     rm -rf $TOPDESTPATH/isopath
 }
diff --git a/scripts/mk-images.sparc b/scripts/mk-images.sparc
index 8047aba..d869f9c 100644
--- a/scripts/mk-images.sparc
+++ b/scripts/mk-images.sparc
@@ -163,7 +163,7 @@ doPostImages() {
 			-x repodata \
 			-sparc-label "$PRODUCT $VERSION Boot Disc" \
 			-o $TOPDESTPATH/images/$BOOTISO -graft-points \
-			boot=$TOPDESTPATH/boot images/install.img=$TOPDESTPATH/images/install.img
+			boot=$TOPDESTPATH/boot
 		implantisomd5 $TOPDESTPATH/images/$BOOTISO
 	fi
 }
-- 
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list