add support for the ks=nfs:host/path/ ks=http://host/path/ syntax to resolve

to ip-kickstart.  Also adds ftp kickstart file pulling.  (#77320 at least...
I think there are a few others on this)

1 files changed, 7 insertions, 7 deletions

diff --git a/loader2/net.c b/loader2/net.c
index c03602a7a..7a8abd7c7 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -215,7 +215,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
                 logMessage("pump told us: %s", chptr);
                 return;
             }
-
+            
             cfg->isDynamic = 1;
         } else if (inet_aton(loaderData->ip, &addr)) {
             cfg->dev.ip = addr;
@@ -755,12 +755,15 @@ int chooseNetworkInterface(struct knownDevices * kd,
  * the network */
 int kickstartNetworkUp(struct knownDevices * kd, 
                        struct loaderData_s * loaderData,
+                       struct networkDeviceConfig *netCfgPtr,
                        int flags) {
     int rc;
-    struct networkDeviceConfig netCfg;
 
     initLoopback();
 
+    memset(netCfgPtr, 0, sizeof(*netCfgPtr));
+    netCfgPtr->isDynamic = 1;
+
     do {
         /* this is smart and does the right thing based on whether or not
          * we have ksdevice= specified */
@@ -784,12 +787,9 @@ int kickstartNetworkUp(struct knownDevices * kd,
     } 
     loaderData->ipinfo_set = 1;
 
-    memset(&netCfg, 0, sizeof(netCfg));
-    netCfg.isDynamic = 1;
-
-    setupNetworkDeviceConfig(&netCfg, loaderData, flags);
+    setupNetworkDeviceConfig(netCfgPtr, loaderData, flags);
 
-    rc = readNetConfig(loaderData->netDev, &netCfg, flags);
+    rc = readNetConfig(loaderData->netDev, netCfgPtr, flags);
     if (rc) {
         logMessage("unable to setup networking");
         return -1;