From 66026c2b566f645289ff07d048992bb11e86dd47 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 9 Aug 2006 19:07:44 +0000 Subject: * loader2/net.c (setupNetworkDeviceConfig): Test ipinfo_set to see if we already have network configuration information (#200986). Set the dev.ipv4 and dev.ipv6 values when copying in the network config info. Set additional pump flags accordingly. * loader2/loader.c (doLoaderMain): Set netDev.preset = 1 if we have network config data already (#200986). --- loader2/net.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'loader2/net.c') diff --git a/loader2/net.c b/loader2/net.c index 1fcca9c2c..ff6636628 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -346,7 +346,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, parseEthtoolSettings(loaderData); } - if (loaderData->ip) { + if (loaderData->ipinfo_set) { if (is_wireless_interface(loaderData->netDev)) { if (loaderData->essid) { logMessage(INFO, "setting specified essid of %s", @@ -401,12 +401,14 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, cfg->preset = 1; } else if (inet_pton(AF_INET, loaderData->ip, &addr) >= 1) { cfg->dev.ip = ip_addr_in(&addr); - cfg->dev.set |= PUMP_INTFINFO_HAS_IP; + cfg->dev.ipv4 = ip_addr_in(&addr); + cfg->dev.set |= PUMP_INTFINFO_HAS_IP|PUMP_INTFINFO_HAS_IPV4_IP; cfg->isDynamic = 0; cfg->preset = 1; } else if (inet_pton(AF_INET6, loaderData->ip, &addr6) >= 1) { cfg->dev.ip = ip_addr_in6(&addr6); - cfg->dev.set |= PUMP_INTFINFO_HAS_IP; + cfg->dev.ipv6 = ip_addr_in6(&addr6); + cfg->dev.set |= PUMP_INTFINFO_HAS_IP|PUMP_INTFINFO_HAS_IPV6_IP; cfg->isDynamic = 0; cfg->preset = 1; } else { /* invalid ip information, disable the setting of ip info */ -- cgit