summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2008-07-24 13:38:02 -0400
committerChris Lumens <clumens@redhat.com>2008-07-24 13:38:14 -0400
commite6ecdb7651852fabe69560252bd954225c0e91fb (patch)
treed4352abdfc401a5ab6180e5715f84a650b782b5f /loader2
parent9d120444843ec87c84cad8b20a12e0421639b279 (diff)
downloadanaconda-e6ecdb7651852fabe69560252bd954225c0e91fb.tar.gz
anaconda-e6ecdb7651852fabe69560252bd954225c0e91fb.tar.xz
anaconda-e6ecdb7651852fabe69560252bd954225c0e91fb.zip
Look for updates.img and product.img on the boot.iso.
Diffstat (limited to 'loader2')
-rw-r--r--loader2/cdinstall.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
index 6806f3600..532b41f80 100644
--- a/loader2/cdinstall.c
+++ b/loader2/cdinstall.c
@@ -357,6 +357,8 @@ static char *setupCdrom(char *location, struct loaderData_s *loaderData,
if (!(rc=doPwMount(devices[i]->device, location, "iso9660", "ro"))) {
cddev = devices[i]->device;
if (!access(stage2loc, R_OK)) {
+ char *updpath;
+
if (mediaCheck)
queryCDMediaCheck(devices[i]->device, location);
@@ -382,6 +384,24 @@ static char *setupCdrom(char *location, struct loaderData_s *loaderData,
continue;
}
+ if (asprintf(&updpath, "%s/images/updates.img", location) == -1) {
+ logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
+ abort();
+ }
+
+ logMessage(INFO, "Looking for updates in %s", updpath);
+ copyUpdatesImg(updpath);
+ free(updpath);
+
+ if (asprintf(&updpath, "%s/images/product.img", location) == -1) {
+ logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
+ abort();
+ }
+
+ logMessage(INFO, "Looking for product in %s", updpath);
+ copyProductImg(updpath);
+ free(updpath);
+
/* if in rescue mode and we copied stage2 to RAM */
/* we can now unmount the CD */
if (FL_RESCUE(flags) && stage2inram) {