summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--loader2/net.c5
-rw-r--r--loader2/nfsinstall.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/loader2/net.c b/loader2/net.c
index 89100a9bb..da55d7a5f 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -166,6 +166,7 @@ static int getDnsServers(struct networkDeviceConfig * cfg) {
return LOADER_OK;
}
+/* given loader data from kickstart, populate network configuration struct */
void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
struct loaderData_s * loaderData,
int flags) {
@@ -668,10 +669,10 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
if (noDns) {
loaderData->noDns = 1;
}
-
}
-
+/* if multiple interfaces get one to use from user. */
+/* NOTE - uses kickstart data available in loaderData */
int chooseNetworkInterface(struct knownDevices * kd,
struct loaderData_s * loaderData,
int flags) {
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index e3a6a5624..565dfb52e 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -92,6 +92,7 @@ char * mountNfsImage(struct installMethod * method,
memset(&netDev, 0, sizeof(netDev));
netDev.isDynamic = 1;
+ /* populate netDev based on any kickstart data */
setupNetworkDeviceConfig(&netDev, loaderData, flags);
/* JKFIXME: ASSERT -- we have a network device when we get here */