Skip askmethod dialog if user passes repo= and stage2=

I was getting the askmethod dialog in loader even when I passed
the repo= and stage2= parameters.  Check loaderData->stage2Data
and skip askmethod if it contains...data?

1 files changed, 2 insertions, 4 deletions

diff --git a/loader/loader.c b/loader/loader.c
index 6c1aae180..1e6acb97a 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1004,7 +1004,7 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData,
         }
         else if (!strncasecmp(argv[i], "method=", 7)) {
             logMessage(WARNING, "method= is deprecated.  Please use repo= instead.");
-            loaderData->instRepo = strdup(argv[i] + 7); 
+            loaderData->instRepo = strdup(argv[i] + 7);
         }
         else if (!strncasecmp(argv[i], "repo=", 5))
             loaderData->instRepo = strdup(argv[i] + 5);
@@ -1148,7 +1148,6 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData,
     return;
 }
 
-
 #if 0
 /* determine if we are using a framebuffer console.  return 1 if so */
 static int checkFrameBuffer() {
@@ -1168,7 +1167,6 @@ static int checkFrameBuffer() {
 }
 #endif
 
-
 /* make sure they have enough ram */
 static void checkForRam(void) {
     if (totalMemory() < MIN_RAM) {
@@ -1335,7 +1333,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
             }
 
             case STEP_METHOD: {
-                if (loaderData->method != -1)
+                if (loaderData->method != -1 || loaderData->stage2Data)
                     skipMethodDialog = 1;
                 else if (FL_CMDLINE(flags)) {
                     fprintf(stderr, "No method given for cmdline mode, aborting\n");