diff options
| author | Jeremy Katz <katzj@redhat.com> | 2009-07-16 11:21:16 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2009-07-21 19:23:38 -0400 |
| commit | 9756532b6fdd94ba7ab3b85bbc720785f781c52d (patch) | |
| tree | ad474650d7fa9d59183972b0cc9987e3fad6c8c2 /loader | |
| parent | 5783ef066ab10b0f1573f1670da5f343cb680e3d (diff) | |
| download | anaconda-9756532b6fdd94ba7ab3b85bbc720785f781c52d.tar.gz anaconda-9756532b6fdd94ba7ab3b85bbc720785f781c52d.tar.xz anaconda-9756532b6fdd94ba7ab3b85bbc720785f781c52d.zip | |
Try to auto-find the CD even if stage2= is specified
Try to auto-find the CD even if stage2= is specified; this lets us
add stage2= and then the isohybrid'd images can be dd'd to a usb
stick and stage2 gets find there as well as on the CD.
Next step is to be able to get rid of the auto CD finding by
always explicitly specifying stage2=
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c index 8d92ed461..b48b0a0df 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1247,7 +1247,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData, * it. However if stage2= was given, use that value as an override here. * That will also then bypass any method selection UI in loader. */ - if (!FL_ASKMETHOD(flags) && !loaderData->stage2Data) { + if (!FL_ASKMETHOD(flags)) { url = findAnacondaCD("/mnt/stage2"); if (url) { setStage2LocFromCmdline(url, loaderData); @@ -1261,7 +1261,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData, skipLangKbd = 1; flags |= LOADER_FLAGS_NOPASS; - } else if (loaderData->instRepo) { + } else if (!loaderData->stage2Data && loaderData->instRepo) { /* If no CD/DVD with a stage2 image was found and we were given a * repo=/method= parameter, try to piece together a valid setting * for the stage2= parameter based on that. |