diff options
| author | Jeremy Katz <katzj@redhat.com> | 2009-08-14 11:14:33 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2009-08-14 11:14:33 -0400 |
| commit | 1fbf3c9d8d550fc01ae34528533377adc19d1611 (patch) | |
| tree | 48a6ff3634e291d8c4b8d88b21ebbde3adea9e8a /loader | |
| parent | ae6737ce6467d50aa278d03eea15f91cfb89a704 (diff) | |
| download | anaconda-1fbf3c9d8d550fc01ae34528533377adc19d1611.tar.gz anaconda-1fbf3c9d8d550fc01ae34528533377adc19d1611.tar.xz anaconda-1fbf3c9d8d550fc01ae34528533377adc19d1611.zip | |
Fix askmethod to work with stage= being specified (#516973)
We now are specifying stage2= but if they add askmethod, we should
still end up doing the asking. So add the check for stage2 implying
skipping the method dialog under the !askmethod case
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/loader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/loader/loader.c b/loader/loader.c index 53e00fd31..d399e43c9 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1288,6 +1288,9 @@ static char *doLoaderMain(struct loaderData_s *loaderData, * path that's at the end of it. */ loaderData->inferredStage2 = 1; + skipMethodDialog = 1; + } else if (loaderData->stage2Data) { + skipMethodDialog = 1; } } @@ -1352,7 +1355,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData, } case STEP_METHOD: { - if (loaderData->method != -1 || loaderData->stage2Data) + if (loaderData->method != -1) skipMethodDialog = 1; else if (FL_CMDLINE(flags)) { fprintf(stderr, "No method given for cmdline mode, aborting\n"); |