summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-12-06 21:11:15 +0000
committerJeremy Katz <katzj@redhat.com>2002-12-06 21:11:15 +0000
commitcc68c073dd8e168ab4387af16f48a108d894da8d (patch)
tree60688a9a358f96d110384c2a1f7f4f71f0bf852b
parent7764f971edf09a1b1966057f56ad0f544d617f38 (diff)
downloadanaconda-cc68c073dd8e168ab4387af16f48a108d894da8d.tar.gz
anaconda-cc68c073dd8e168ab4387af16f48a108d894da8d.tar.xz
anaconda-cc68c073dd8e168ab4387af16f48a108d894da8d.zip
loader changes for s/netstg1/netstg2/ and s/hdstg1/hdstg2/
-rw-r--r--loader2/hdinstall.c4
-rw-r--r--loader2/method.c2
-rw-r--r--loader2/urlinstall.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 24a59d72f..a466532d6 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -191,7 +191,7 @@ static int loadHDImages(char * prefix, char * dir, int flags,
path = alloca(50 + strlen(prefix) + (dir ? strlen(dir) : 2));
- sprintf(path, "%s/%s/RedHat/base/hdstg1.img", prefix, dir ? dir : "");
+ sprintf(path, "%s/%s/RedHat/base/hdstg2.img", prefix, dir ? dir : "");
if ((fd = open(path, O_RDONLY)) < 0) {
logMessage("failed to open %s: %s", path, strerror(errno));
@@ -203,7 +203,7 @@ static int loadHDImages(char * prefix, char * dir, int flags,
sprintf(path, "%s/%s/RedHat/base/updates.img", prefix, dir ? dir : "");
copyUpdatesImg(path);
- rc = copyFileAndLoopbackMount(fd, "/tmp/ramfs/hdstg1.img", flags,
+ rc = copyFileAndLoopbackMount(fd, "/tmp/ramfs/hdstg2.img", flags,
device, mntpoint);
close(fd);
diff --git a/loader2/method.c b/loader2/method.c
index eb07dda7f..c2c761e69 100644
--- a/loader2/method.c
+++ b/loader2/method.c
@@ -164,7 +164,7 @@ char * validIsoImages(char * dirName) {
continue;
}
- if (!access("/tmp/loopimage/RedHat/base/hdstg1.img", F_OK)) {
+ if (!access("/tmp/loopimage/RedHat/base/hdstg2.img", F_OK)) {
umountLoopback("/tmp/loopimage", "loop7");
break;
}
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
index 65edf56ff..f9e518b3c 100644
--- a/loader2/urlinstall.c
+++ b/loader2/urlinstall.c
@@ -89,8 +89,8 @@ static int loadUrlImages(struct iurlinfo * ui, int flags) {
unlink("/tmp/ramfs/updates-disk.img");
}
- if (loadSingleUrlImage(ui, "RedHat/base/netstg1.img", flags,
- "/tmp/ramfs/netstg1.img",
+ if (loadSingleUrlImage(ui, "RedHat/base/netstg2.img", flags,
+ "/tmp/ramfs/netstg2.img",
"/mnt/runtime", "loop0", 0)) {
newtWinMessage(_("Error"), _("OK"),
_("Unable to retrieve the install image."));