summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
Diffstat (limited to 'loader2')
-rw-r--r--loader2/cdinstall.c8
-rw-r--r--loader2/hdinstall.c2
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");