diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-05-27 20:58:33 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-05-27 20:58:33 +0000 |
| commit | 4255802e876f1e4be2cf48439dcc44cd14836ba3 (patch) | |
| tree | 6aa7eee44c1eb8501a36f183f676950dadceb0cd | |
| parent | bd592640b57853c9a0307fe1a3148f16bf7d1bfe (diff) | |
| download | anaconda-4255802e876f1e4be2cf48439dcc44cd14836ba3.tar.gz anaconda-4255802e876f1e4be2cf48439dcc44cd14836ba3.tar.xz anaconda-4255802e876f1e4be2cf48439dcc44cd14836ba3.zip | |
fix dhcp to actually have a device to get a dhcp request for
| -rw-r--r-- | loader2/net.c | 11 | ||||
| -rw-r--r-- | loader2/net.h | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/loader2/net.c b/loader2/net.c index 4148fc429..78b7b6704 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -272,7 +272,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg, if (!FL_TESTING(flags)) { waitForLink(loaderData->netDev); - chptr = doDhcp(cfg, loaderData->netCls); + chptr = doDhcp(loaderData->netDev, cfg, loaderData->netCls); } else { chptr = NULL; } @@ -542,7 +542,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, _("Sending request for IP information for %s..."), device, 0); waitForLink(device); - chptr = doDhcp(&newCfg, dhcpclass); + chptr = doDhcp(device, &newCfg, dhcpclass); newtPopWindow(); } else { chptr = NULL; @@ -607,6 +607,7 @@ static int setupWireless(struct networkDeviceConfig *dev) { * up */ if (!is_wireless_interface(dev->dev.device)) return 0; + if (dev->essid) { logMessage("setting essid for %s to %s", dev->dev.device, dev->essid); if (set_essid(dev->dev.device, dev->essid) < 0) { @@ -629,9 +630,11 @@ char * setupInterface(struct networkDeviceConfig *dev) { return pumpSetupInterface(&dev->dev); } -char * doDhcp(struct networkDeviceConfig *dev, char * dhcpclass) { +char * doDhcp(char * ifname, + struct networkDeviceConfig *dev, char * dhcpclass) { setupWireless(dev); - return pumpDhcpClassRun(dev->dev.device, 0, 0, NULL, + logMessage("running dhcp for %s", ifname); + return pumpDhcpClassRun(ifname, 0, 0, NULL, dhcpclass ? dhcpclass : "anaconda", &dev->dev, NULL); diff --git a/loader2/net.h b/loader2/net.h index c1e82f112..68390289e 100644 --- a/loader2/net.h +++ b/loader2/net.h @@ -45,6 +45,7 @@ int kickstartNetworkUp(struct loaderData_s * loaderData, int flags); char * setupInterface(struct networkDeviceConfig *dev); -char * doDhcp(struct networkDeviceConfig *dev, char * dhcpclass); +char * doDhcp(char * ifname, + struct networkDeviceConfig *dev, char * dhcpclass); #endif |