parse command line arguments sooner so that --test really doesn't depend

on /var/run/loader.run not being there

1 files changed, 16 insertions, 16 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index 9026e9245..ade4e3496 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1093,8 +1093,23 @@ int main(int argc, char ** argv) {
     if (!strcmp(argv[0] + strlen(argv[0]) - 5, "rmmod"))
         return ourRmmodCommand(argc, argv);
 
+    /* now we parse command line options */
+    optCon = poptGetContext(NULL, argc, (const char **) argv, optionTable, 0);
+
+    if ((rc = poptGetNextOpt(optCon)) < -1) {
+        fprintf(stderr, "bad option %s: %s\n",
+                poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
+                poptStrerror(rc));
+        exit(1);
+    }
+
+    if ((arg = (char *) poptGetArg(optCon))) {
+        fprintf(stderr, "unexpected argument: %s\n", arg);
+        exit(1);
+    }
+
     if (!testing && !access("/var/run/loader.run", R_OK)) {
-        printf(_("loader has already been run.  Starting shell."));
+        printf(_("loader has already been run.  Starting shell.\n"));
         execl("/bin/sh", "-/bin/sh", NULL);
         exit(0);
     }
@@ -1111,21 +1126,6 @@ int main(int argc, char ** argv) {
             flags |= LOADER_FLAGS_SERIAL;
     }
 
-    /* now we parse command line options */
-    optCon = poptGetContext(NULL, argc, (const char **) argv, optionTable, 0);
-
-    if ((rc = poptGetNextOpt(optCon)) < -1) {
-        fprintf(stderr, "bad option %s: %s\n",
-                poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
-                poptStrerror(rc));
-        exit(1);
-    }
-
-    if ((arg = (char *) poptGetArg(optCon))) {
-        fprintf(stderr, "unexpected argument: %s\n", arg);
-        exit(1);
-    }
-
     if (testing) flags |= LOADER_FLAGS_TESTING;
     if (mediacheck) flags |= LOADER_FLAGS_MEDIACHECK;
     if (ksFile) flags |= LOADER_FLAGS_KICKSTART;