Rest of stage2.img changes.

Reference install.img in anaconda rather than stage2.img.

7 files changed, 18 insertions, 18 deletions

diff --git a/image.py b/image.py
index c9c99b249..073733f17 100644
--- a/image.py
+++ b/image.py
@@ -65,10 +65,10 @@ def findIsoImages(path, messageWindow):
                     if num not in discNum or discArch != arch:
                         continue
 
-                    # if it's disc1, it needs to have images/stage2.img
+                    # if it's disc1, it needs to have images/install.img
                     if (num == 1 and not
-                        os.access("/mnt/cdimage/images/stage2.img", os.R_OK)):
-                        log.warning("%s doesn't have a stage2.img, skipping" %(what,))
+                        os.access("/mnt/cdimage/images/install.img", os.R_OK)):
+                        log.warning("%s doesn't have a install.img, skipping" %(what,))
                         continue
                     # we only install binary packages, so let's look for a
                     # product/ dir and hope that this avoids getting
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
index e3dd4ab71..3b676c1f5 100644
--- a/loader2/cdinstall.c
+++ b/loader2/cdinstall.c
@@ -256,7 +256,7 @@ static void queryCDMediaCheck(char *dev, char *location) {
                     continue;
                 }
 
-                if (asprintf(&stage2loc, "%s/images/stage2.img",
+                if (asprintf(&stage2loc, "%s/images/install.img",
                              location) == -1) {
                     logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
                     abort();
@@ -299,7 +299,7 @@ static char *setupCdrom(char *location, struct loaderData_s *loaderData,
         return NULL;
     }
 
-    if (asprintf(&stage2loc, "%s/images/stage2.img", location) == -1) {
+    if (asprintf(&stage2loc, "%s/images/install.img", location) == -1) {
         logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
         abort();
     }
@@ -367,8 +367,8 @@ static char *setupCdrom(char *location, struct loaderData_s *loaderData,
                     /* aid system recovery.                                   */
                     if (FL_RESCUE(flags) && !FL_TEXT(flags) &&
                         totalMemory() > 128000) {
-                        rc = copyFile(stage2loc, "/tmp/stage2.img");
-                        stage2img = strdup("/tmp/stage2.img");
+                        rc = copyFile(stage2loc, "/tmp/install.img");
+                        stage2img = strdup("/tmp/install.img");
                         stage2inram = 1;
                     } else {
                         stage2img = strdup(stage2loc);
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 662465150..eaf3da98f 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -328,7 +328,7 @@ char * mountHardDrive(struct installMethod * method,
          */
         substr = strstr(dir, ".img");
         if (!substr || (substr && *(substr+4) != '\0')) {
-            if (asprintf(&dir, "%s/stage2.img", dir) == -1) {
+            if (asprintf(&dir, "%s/install.img", dir) == -1) {
                 logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
                 abort();
             }
diff --git a/loader2/loader.c b/loader2/loader.c
index c2f2c3cb2..7ed1042cc 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1176,7 +1176,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
              */
             char *tmp;
 
-            if (asprintf(&tmp, "%s/images/stage2.img",
+            if (asprintf(&tmp, "%s/images/install.img",
                          loaderData->instRepo) == -1) {
                 logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
                 abort();
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index 8bc9dd297..efde32a1c 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -155,7 +155,7 @@ char * mountNfsImage(struct installMethod * method,
                  */
                 substr = strstr(directory, ".img");
                 if (!substr || (substr && *(substr+4) != '\0')) {
-                    if (asprintf(&tmp, "nfs:%s:%s/images/stage2.img",
+                    if (asprintf(&tmp, "nfs:%s:%s/images/install.img",
                                  host, directory) == -1) {
                         logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
                         abort();
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
index 4cbb866f6..48d1cb73d 100644
--- a/loader2/urlinstall.c
+++ b/loader2/urlinstall.c
@@ -118,7 +118,7 @@ static int loadUrlImages(struct iurlinfo * ui) {
     if ((path = strndup(ui->prefix, slash - ui->prefix)) == NULL)
         path = ui->prefix;
 
-    /* grab the updates.img before stage2.img so that we minimize our
+    /* grab the updates.img before install.img so that we minimize our
      * ramdisk usage */
     if (asprintf(&buf, "%s/%s", path, "updates.img") == -1) {
         logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
@@ -140,7 +140,7 @@ static int loadUrlImages(struct iurlinfo * ui) {
 
     free(buf);
 
-    /* grab the product.img before stage2.img so that we minimize our
+    /* grab the product.img before install.img so that we minimize our
      * ramdisk usage */
     if (asprintf(&buf, "%s/%s", path, "product.img") == -1) {
         logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
@@ -159,7 +159,7 @@ static int loadUrlImages(struct iurlinfo * ui) {
 
     free(buf);
 
-    if (asprintf(&dest, "/tmp/stage2.img") == -1) {
+    if (asprintf(&dest, "/tmp/install.img") == -1) {
         logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
         abort();
     }
@@ -224,7 +224,7 @@ char *mountUrlImage(struct installMethod *method, char *location,
                      */
                     substr = strstr(ui.prefix, ".img");
                     if (!substr || (substr && *(substr+4) != '\0')) {
-                        if (asprintf(&ui.prefix, "%s/images/stage2.img",
+                        if (asprintf(&ui.prefix, "%s/images/install.img",
                                      ui.prefix) == -1) {
                             logMessage(CRITICAL, "%s: %d: %m", __func__,
                                        __LINE__);
diff --git a/yuminstall.py b/yuminstall.py
index 590170f06..1467e3c1e 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -348,13 +348,13 @@ class AnacondaYum(YumSorter):
             return
 
         # If we've booted off the first CD/DVD (so, not the boot.iso) then
-        # copy the stage2.img to the filesystem and switch loopback devices
+        # copy the install.img to the filesystem and switch loopback devices
         # to there.  Otherwise we won't be able to unmount and swap media.
-        stage2img = "%s/images/stage2.img" % self.tree
+        stage2img = "%s/images/install.img" % self.tree
         if not self.anaconda.mediaDevice or not os.path.exists(stage2img):
             return
 
-        self._loopbackFile = "%s%s/rhinstall-stage2.img" % (chroot,
+        self._loopbackFile = "%s%s/rhinstall-install.img" % (chroot,
                              fsset.filesystemSpace(chroot)[0][0])
 
         try:
@@ -366,7 +366,7 @@ class AnacondaYum(YumSorter):
             if win:
                 win.pop()
 
-            log.critical("error transferring stage2.img: %s" %(e,))
+            log.critical("error transferring install.img: %s" %(e,))
 
             if isinstance(e, IOError) and e.errno == 5:
                 msg = _("An error occurred transferring the install image "