diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-04-12 18:58:58 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-04-12 18:58:58 +0000 |
| commit | bcb85f902fbf5efb4e7c0ba83b99503f33d31414 (patch) | |
| tree | 3dd30d4971d79321ec16f127d45adcef7f5a3d4a /loader2 | |
| parent | cdf7dd386e2c0cd9ee8c70ce512a8197872ea172 (diff) | |
* loader2/urlinstall.c (mountUrlImage): For instances where we prefer
to load stage2 from the boot CD-ROM (e.g., rescuecd) but the user will
be doing an HTTP or FTP install, do a test download of .discinfo to
ensure they have entered the correct path (#232509).
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/urlinstall.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index 8486a21fe..b19947e91 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -281,6 +281,18 @@ char * mountUrlImage(struct installMethod * method, cdurl = findAnacondaCD(location, modInfo, modLoaded, *modDeps, 0); if (cdurl) { + /* verify that our URL is specifying the correct tree */ + /* we do this by attempting to pull a .discinfo file */ + if (!loadSingleUrlImage(&ui, ".discinfo", NULL, NULL, NULL, 1)) { + stage = URL_STAGE_MAIN; + dir = -1; + + if (loaderData->method >= 0) + loaderData->method = -1; + + break; + } + logMessage(INFO, "Detected stage 2 image on CD"); winStatus(50, 3, _("Media Detected"), _("Local installation media detected..."), 0); |