another taroon merge. tagged before as before-taroon-merge, after as

after-taroon-merge

this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.

1 files changed, 9 insertions, 0 deletions

diff --git a/loader2/kickstart.c b/loader2/kickstart.c
index 34bd2cdfb..47b213d00 100644
--- a/loader2/kickstart.c
+++ b/loader2/kickstart.c
@@ -65,6 +65,8 @@ static void setTextMode(struct loaderData_s * loaderData, int argc,
                         char ** argv, int * flagsPtr);
 static void setGraphicalMode(struct loaderData_s * loaderData, int argc, 
                         char ** argv, int * flagsPtr);
+static void setCmdlineMode(struct loaderData_s * loaderData, int argc, 
+                           char ** argv, int * flagsPtr);
 void loadKickstartModule(struct loaderData_s * loaderData, int argc, 
                          char ** argv, int * flagsPtr);
 
@@ -80,6 +82,7 @@ struct ksCommandNames ksTable[] = {
     { KS_CMD_LANG, "lang", setKickstartLanguage },
     { KS_CMD_DD, "driverdisk", useKickstartDD },
     { KS_CMD_DEVICE, "device", loadKickstartModule },
+    { KS_CMD_CMDLINE, "cmdline", setCmdlineMode },
     { KS_CMD_NONE, NULL, NULL }
 };
 
@@ -374,6 +377,12 @@ static void setGraphicalMode(struct loaderData_s * loaderData, int argc,
     return;
 }
 
+static void setCmdlineMode(struct loaderData_s * loaderData, int argc, 
+                           char ** argv, int * flagsPtr) {
+    (*flagsPtr) = (*flagsPtr) | LOADER_FLAGS_CMDLINE;
+    return;
+}
+
 void setupKickstart(struct loaderData_s * loaderData, int * flagsPtr) {
     struct ksCommandNames * cmd;
     int argc;