Rename stage2.img to install.img

To make the installation image files more clear and since
we have removed minstg2.img, rename stage2.img to
install.img.

7 files changed, 23 insertions, 13 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 164bbe7db..97eaf6145 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -197,14 +197,14 @@ BUILDINSTALL=$BUILDINSTDIR/buildinstall
 if [ -n "$UPDATES" ]; then UPDATES="--updates $UPDATES"; fi
 
 echo "Building images..."
-$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --stg2dir $TREEDIR/stage2 $yumconf
+$UPD_INSTROOT $DEBUGSTR $NOGRSTR --arch $BUILDARCH $UPDATES --imgdir $TREEDIR/install $yumconf
 
 echo "Writing .treeinfo file..."
 $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$OUTPUT/.treeinfo
 
 # FIXME: need to update mk-images to take the yumconf
 echo "Making images..."
-$MK_IMAGES $DEBUGSTR $NOGRSTR --stg2dir $TREEDIR/stage2 --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
+$MK_IMAGES $DEBUGSTR $NOGRSTR --imgdir $TREEDIR/install --arch $BUILDARCH --product "$PRODUCTSTR" --version $VERSION --bugurl "$BUGURL" --output $OUTPUT $yumconf
 
 echo "Writing .discinfo file"
 $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL"  --outfile=$OUTPUT/.discinfo
diff --git a/scripts/mk-images b/scripts/mk-images
index cd6ac949b..60e48e6ab 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -50,7 +50,7 @@ while [ $# -gt 0 ]; do
 	    shift; shift
 	    ;;
 
-	--stg2dir)
+	--imgdir)
 	    IMGPATH=$2
 	    shift; shift
 	    ;;
@@ -85,6 +85,11 @@ while [ $# -gt 0 ]; do
 	    shift; shift
 	    ;;
 
+	--stg2dir)
+	    echo "*** DeprecationWarning: please use --imgdir instead of --stg2dir." >&2
+	    shift; shift
+	    ;;
+
 	*)
 	    yumconf=$1
 	    shift
@@ -726,8 +731,8 @@ makemainimage () {
 
 makeSecondStage() {
     echo "[stage2]" >> $TOPDESTPATH/.treeinfo
-    echo "Building stage2.img"
-    makemainimage "stage2" "squashfs"
+    echo "Building install.img"
+    makemainimage "install" "squashfs"
     [ $? = 0 ] || exit 1
 }
 
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index ef387ce35..fb2ad60ae 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -126,6 +126,6 @@ EOF
 #     makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODS =scsi"
 #     makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODS =net"
 #     makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODS =scsi =net"
-#     makemainimage "stage2" "cramfs"
+#     makemainimage "install" "cramfs"
 #}
 
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 55b2fc749..871ce6a61 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -167,7 +167,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/stage2.img=$TOPDESTPATH/images/stage2.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 images/install.img=$TOPDESTPATH/images/install.img
         implantisomd5 $TOPDESTPATH/images/$BOOTISO
     fi
 }
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index ceb61a599..b90865b68 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -165,7 +165,7 @@ doPostImages() {
 	$MACBOOT \
 	-map $BOOTDISKDIR/mapping -magic $BOOTDISKDIR/magic \
 	-no-desktop -allow-multidot -graft-points $TOPDESTPATH/isopath \
-	images/stage2.img=$TOPDESTPATH/images/stage2.img
+	images/install.img=$TOPDESTPATH/images/install.img
     implantisomd5 $TOPDESTPATH/images/$BOOTISO
     rm -rf $TOPDESTPATH/isopath
 }
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 408437096..bdee490f5 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -157,7 +157,7 @@ __EOT__
 
 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
+       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/install.img=$TOPDESTPATH/images/install.img
        implantisomd5 $TOPDESTPATH/images/$BOOTISO
     fi
 
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 5da097063..b98fc2193 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -34,7 +34,7 @@ while [ $# -gt 0 ]; do
 	    shift; shift
 	    ;;
 
-	--stg2dir)
+	--imgdir)
 	    DEST=$2
 	    shift; shift
 	    ;;
@@ -56,6 +56,11 @@ while [ $# -gt 0 ]; do
 	    shift; shift
 	    ;;
 
+	--stg2dir)
+	    echo "*** DeprecationWarning: please use --imgdir instead of --stg2dir." >&2
+	    shift; shift
+	    ;;
+
 	*)
 	    yumconf=$1
 	    shift
@@ -65,7 +70,7 @@ done
 
 if [ -z "$yumconf" ]; then
 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
-	echo "usage:        $0 [--debug] [--arch arch] [--stg2dir stg2dir] [yumconf]"
+	echo "usage:        $0 [--debug] [--arch arch] [--imgdir imgdir] [yumconf]"
 	exit 1
 fi
 
@@ -285,7 +290,7 @@ PACKAGES="$PACKAGES $XORG"
 #
 # KEEPFILE is all files to keep from the packages in PACKAGES
 #
-# The files in this list define the stage2 image used for all installation
+# The files in this list define the install image used for all installation
 # methods.
 #
 # The rescue mode of anaconda uses these files as well as those defined
@@ -1038,7 +1043,7 @@ find $DEST -name "*.py" | while read fn; do
     ln -sf /dev/null ${fn}c
 done
 
-# some python stuff we don't need for stage2
+# some python stuff we don't need for install image
 rm -rf $DEST/usr/$LIBDIR/python?.?/site-packages/distutils/
 rm -rf $DEST/usr/$LIBDIR/python?.?/site-packages/lib-dynload/japanese
 rm -rf $DEST/usr/$LIBDIR/python?.?/site-packages/encodings/