diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-04-23 05:56:26 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-04-23 05:56:26 -0400 |
| commit | ffe4f5de8a405e71ad5a4fe6bb768dbbf0617c5c (patch) | |
| tree | 9edcb558d0cb20fd057869bfb143c56d162b756a /loader2 | |
| parent | d3b364435cb8141707fd43c8d1041f14c7e878e3 (diff) | |
| download | anaconda-ffe4f5de8a405e71ad5a4fe6bb768dbbf0617c5c.tar.gz anaconda-ffe4f5de8a405e71ad5a4fe6bb768dbbf0617c5c.tar.xz anaconda-ffe4f5de8a405e71ad5a4fe6bb768dbbf0617c5c.zip | |
Change mount point for CD to /mnt/stage2 when looking for stage2 (#443755).
This only affects installations where you are booting the full DVD but (for
some crazy reason) want to do an HD or NFS install. Otherwise we'll already
have /mnt/source mounted for the CD and won't be able to mount the real
installation media on top of it. The DVD will end up getting used even though
that's not what you wanted.
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/cdinstall.c | 8 | ||||
| -rw-r--r-- | loader2/hdinstall.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c index efe1c8ab5..7f3ef1239 100644 --- a/loader2/cdinstall.c +++ b/loader2/cdinstall.c @@ -226,8 +226,9 @@ static void queryCDMediaCheck(char *dev, char *location) { * * requirepkgs=1 means CD should have packages, otherwise we just find stage2 * - * side effect: found cdrom is mounted as /mnt/source. stage2 mounted - * as /mnt/runtime. + * side effect: found cdrom is mounted on 'location' (usually /mnt/source, but + * could also be /mnt/stage2 if we're just looking for a stage2 image). stage2 + * mounted on /mnt/runtime. */ char * setupCdrom(char * location, struct loaderData_s * loaderData, int interactive, int requirepkgs) { @@ -290,9 +291,6 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, } rc = mountStage2(stage2img, imageDir); - /* if we failed, umount location (usually /mnt/source) and - * keep going - */ if (rc) { logMessage(INFO, "mounting stage2 failed"); diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c index 3062290bf..14148ebde 100644 --- a/loader2/hdinstall.c +++ b/loader2/hdinstall.c @@ -73,7 +73,7 @@ static int loadHDImages(char * prefix, char * dir, * passing stage2= overrides this check. */ if (!FL_STAGE2(flags)) - cdurl = findAnacondaCD(location, 0); + cdurl = findAnacondaCD("/mnt/stage2", 0); if (cdurl) { logMessage(INFO, "Detected stage 2 image on CD"); |