diff options
| author | Karsten Hopp <karsten@redhat.de> | 2004-09-01 14:02:17 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.de> | 2004-09-01 14:02:17 +0000 |
| commit | c17faeb0d622047ea6265abfa448428b6455d3af (patch) | |
| tree | ea41d9d74c3fcf94fa6dbac75b1229feaec23a9f /network.py | |
| parent | f2bffa25e02bbd0ed2262c12ed47a050fbeabec0 (diff) | |
| download | anaconda-c17faeb0d622047ea6265abfa448428b6455d3af.tar.gz anaconda-c17faeb0d622047ea6265abfa448428b6455d3af.tar.xz anaconda-c17faeb0d622047ea6265abfa448428b6455d3af.zip | |
- Things are getting complicated.
qeth can hav eth, hsi and tr interfaces, lcs can have eth and tr interfaces,
too. We can't tell apart if p.e. eth0 is qeth or lcs, but need to know it for
sysfs configuration. Remove TYPE=QETH hack and use a more generic NETTYPE
instead
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/network.py b/network.py index 45c06fad1..0a8bbbb03 100644 --- a/network.py +++ b/network.py @@ -59,8 +59,7 @@ def networkDeviceCheck(network, dispatch): # return if the device is of a type that requires a ptpaddr to be specified def isPtpDev(devname): - if (devname.startswith("ctc") or devname.startswith("escon") or - devname.startswith("iucv")): + if (devname.startswith("ctc") or devname.startswith("iucv")): return 1 return 0 @@ -174,13 +173,10 @@ class Network: info [netinf[0]] = string.strip(netinf[1]) self.netdevices [info["DEVICE"]] = NetworkDevice(info["DEVICE"]) for key in ("IPADDR", "NETMASK", "BOOTPROTO", "ONBOOT", "MTU", - "REMIP", "QETH", "SUBCHANNELS", "PORTNAME", + "NETTYPE", "SUBCHANNELS", "PORTNAME", "PEERID", "ESSID", "KEY"): if info.has_key(key): self.netdevices [info["DEVICE"]].set((key, info[key])) - # KH: Hack for special case qeth devices which show up as ethX: - if info.has_key("QETH"): - self.netdevices [info["DEVICE"]].info["TYPE"] = "QETH"; if info.has_key("GATEWAY"): self.gateway = info["GATEWAY"] if info.has_key("DOMAIN"): |