[PATCH rhel6-branch 03/11] Parse all network commands in ks (#638131)

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

---
 loader/kickstart.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/loader/kickstart.c b/loader/kickstart.c
index 007d053..37125ce 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -546,11 +546,15 @@ static void setMediaCheck(struct loaderData_s * loaderData, int argc,
 void runKickstart(struct loaderData_s * loaderData) {
     struct ksCommandNames * cmd;
     int argc;
-    char ** argv;
+    char ** argv = NULL;
 
     logMessage(INFO, "setting up kickstart");
     for (cmd = ksTable; cmd->name; cmd++) {
-        if ((!ksGetCommand(cmd->code, NULL, &argc, &argv)) && cmd->setupData) {
+        if (!strcmp(cmd->name, "network")) {
+            while ((!ksGetCommand(cmd->code, argv, &argc, &argv)) && cmd->setupData) {
+                cmd->setupData(loaderData, argc, argv);
+            }
+        } else if ((!ksGetCommand(cmd->code, NULL, &argc, &argv)) && cmd->setupData) {
             cmd->setupData(loaderData, argc, argv);
         }
     }
-- 
1.7.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list