diff options
| -rw-r--r-- | iw/netconfig_dialog.py | 3 | ||||
| -rw-r--r-- | kickstart.py | 10 | ||||
| -rw-r--r-- | network.py | 12 | ||||
| -rw-r--r-- | vnc.py | 5 |
4 files changed, 8 insertions, 22 deletions
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py index 3cacd1d18..ca3dee7b0 100644 --- a/iw/netconfig_dialog.py +++ b/iw/netconfig_dialog.py @@ -127,8 +127,7 @@ class NetworkConfigurator: else: desc = "%s" %(dev,) store[i] = (desc, dev) - if dev == self.network.firstnetdevice: - combo.set_active_iter(i) + combo.set_active_iter(0) def run(self): gui.addFrame(self.window) diff --git a/kickstart.py b/kickstart.py index 538a75c1d..dd7e8fac2 100644 --- a/kickstart.py +++ b/kickstart.py @@ -392,15 +392,11 @@ class Network(commands.network.F8_Network): if nd.bootProto: devices = self.handler.id.network.netdevices - firstdev = self.handler.id.network.getFirstDeviceName() if (devices and nd.bootProto): if not nd.device: - if devices.has_key(firstdev): - device = firstdev - else: - list = devices.keys () - list.sort() - device = list[0] + list = devices.keys () + list.sort() + device = list[0] else: device = nd.device diff --git a/network.py b/network.py index 4fc716596..76d8b27fd 100644 --- a/network.py +++ b/network.py @@ -224,7 +224,6 @@ class NetworkDevice(SimpleConfigFile): class Network: def __init__(self): - self.firstnetdevice = None self.netdevices = {} self.domains = [] self.hostname = socket.gethostname() @@ -310,9 +309,6 @@ class Network: except: continue - if not oneactive: - self.netdevices[self.firstnetdevice].set(("ONBOOT", "yes")) - def readIfcfgContents(self, dev): ifcfg = "/etc/sysconfig/network-scripts/ifcfg-%s" % (dev,) contents = {} @@ -339,9 +335,6 @@ class Network: def getDevice(self, device): return self.netdevices[device] - def getFirstDeviceName(self): - return self.firstnetdevice - def available(self): # XXX: this should use NetworkManager for device in minihal.get_devices_by_type("net"): @@ -350,8 +343,6 @@ class Network: dev = device['device'] if not self.netdevices.has_key(dev): self.netdevices[dev] = NetworkDevice(dev); - if self.firstnetdevice is None: - self.firstnetdevice = dev self.netdevices[dev].set(('hwaddr', device['net.address'])) self.netdevices[dev].set(('desc', device['description'])) @@ -359,9 +350,6 @@ class Network: if flags.cmdline.has_key("ksdevice"): ksdevice = flags.cmdline["ksdevice"] - if ksdevice and self.netdevices.get(ksdevice) != '': - self.firstnetdevice = ksdevice - return self.netdevices def setHostname(self, hn): @@ -101,7 +101,10 @@ class VncServer: # Look for the first configured interface and use its IP address for # the computer to connect to. - dev = netinfo.getFirstDeviceName() + devices = netinfo.netdevices + list = devices.keys() + list.sort() + dev = devices[list[0]] try: self.ip = isys.getIPAddress(dev) |