diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-08-09 19:07:44 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-08-09 19:07:44 +0000 |
| commit | 66026c2b566f645289ff07d048992bb11e86dd47 (patch) | |
| tree | 166d923548eeb08a16f3463233b5d54de78c5845 /loader2/net.c | |
| parent | c5b8981d553a42dfb87242b44484e8c7428b90dc (diff) | |
| download | anaconda-66026c2b566f645289ff07d048992bb11e86dd47.tar.gz anaconda-66026c2b566f645289ff07d048992bb11e86dd47.tar.xz anaconda-66026c2b566f645289ff07d048992bb11e86dd47.zip | |
* 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).
Diffstat (limited to 'loader2/net.c')
| -rw-r--r-- | loader2/net.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 */ |