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
---
loader/loader.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/loader/loader.c b/loader/loader.c
index 53e00fd..d399e43 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");
--
1.6.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
