diff options
| -rw-r--r-- | iw/xconfig.py | 8 | ||||
| -rw-r--r-- | loader/net.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/iw/xconfig.py b/iw/xconfig.py index ef6f73c88..36658157a 100644 --- a/iw/xconfig.py +++ b/iw/xconfig.py @@ -124,9 +124,6 @@ class XConfigWindow (InstallWindow): setting = self.monlist.get_row_data (row) self.todo.x.setMonitor (setting) - if not self.sunServer: - if self.custom.get_active () and not self.skip.get_active (): - return XCustomWindow if not self.skip.get_active (): if self.xdm.get_active (): self.todo.initlevel = 5 @@ -134,6 +131,11 @@ class XConfigWindow (InstallWindow): self.todo.initlevel = 3 else: self.todo.initlevel = 3 + + if not self.sunServer: + if self.custom.get_active () and not self.skip.get_active (): + return XCustomWindow + return None def customToggled (self, widget, *args): diff --git a/loader/net.c b/loader/net.c index 5955bdfae..a41f1eb1e 100644 --- a/loader/net.c +++ b/loader/net.c @@ -579,6 +579,8 @@ int kickstartNetwork(char * device, struct networkDeviceConfig * netDev, return -1; } netDev->isDynamic = 1; + } else { + strcpy(netDev->dev.device, device); } fillInIpInfo(netDev); |