summaryrefslogtreecommitdiffstats
path: root/isys/isys.c
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-05-25 16:36:33 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-05-25 16:36:33 +0000
commitd589e771768929ea40629a0c13c2559cff191df8 (patch)
tree173f8e38be62ef9b39eda17a99accacb43dd3824 /isys/isys.c
parent6aa1372e0abf347e7c908af1e7b61bb83eaece4c (diff)
downloadanaconda-d589e771768929ea40629a0c13c2559cff191df8.tar.gz
anaconda-d589e771768929ea40629a0c13c2559cff191df8.tar.xz
anaconda-d589e771768929ea40629a0c13c2559cff191df8.zip
* isys/isys.c (doDhcpNetDevice): Make sure the interface is brought up
with the config info obtained from the DHCP lease.
Diffstat (limited to 'isys/isys.c')
-rw-r--r--isys/isys.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/isys/isys.c b/isys/isys.c
index 7b2c17793..fe7275c0b 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -610,7 +610,8 @@ void pumplogger(void *arg, int priority, char *fmt, va_list va) {
}
static PyObject * doDhcpNetDevice(PyObject * s, PyObject * args) {
- char *device, *r, *ipv4method = NULL, *ipv6method = NULL, *dhcpclass = NULL;
+ char *device = NULL, *r = NULL;
+ char *ipv4method = NULL, *ipv6method = NULL, *dhcpclass = NULL;
int useipv4, useipv6;
char buf[47];
time_t timeout = 45;
@@ -660,11 +661,16 @@ static PyObject * doDhcpNetDevice(PyObject * s, PyObject * args) {
pref |= DHCPv6_DISABLE_RESOLVER | DHCPv4_DISABLE_HOSTNAME_SET;
if (!(pref & DHCPv4_DISABLE) || !(pref & DHCPv6_DISABLE)) {
- r = pumpDhcpClassRun(&cfg, 0, dhcpclass, pref, 0, timeout,
+ r = pumpDhcpClassRun(&cfg, NULL, dhcpclass, pref, 0, timeout,
pumplogger, LOG_ERR);
if (r) {
Py_INCREF(Py_None);
return Py_None;
+ } else {
+ if (pumpSetupInterface(&cfg)) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
}
}