diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-06-13 22:05:54 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-06-13 22:05:54 +0000 |
| commit | 7f888cf8d6cc78bdcfaabb8ca86199565af75c10 (patch) | |
| tree | f9e70ff40e2c01111b40ebbef42407e5b00feab1 /network.py | |
| parent | 9bda9dc65064165502f9a8d07e1e1cd67ed85771 (diff) | |
| download | anaconda-7f888cf8d6cc78bdcfaabb8ca86199565af75c10.tar.gz anaconda-7f888cf8d6cc78bdcfaabb8ca86199565af75c10.tar.xz anaconda-7f888cf8d6cc78bdcfaabb8ca86199565af75c10.zip | |
Filter out sitX devices from the list.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/network.py b/network.py index a2f48f76c..d6f5d20ee 100644 --- a/network.py +++ b/network.py @@ -279,16 +279,18 @@ class Network: lines = lines[2:] for line in lines: dev = string.strip(line[0:6]) - if dev != "lo" and not self.netdevices.has_key(dev): + if dev != "lo" and dev[0:3] != "sit" and not self.netdevices.has_key(dev): if self.firstnetdevice is None: self.firstnetdevice = dev + self.netdevices[dev] = NetworkDevice(dev) - try: - hwaddr = isys.getMacAddress(dev) - if rhpl.getArch() != "s390" and hwaddr and hwaddr != "00:00:00:00:00:00" and hwaddr != "ff:ff:ff:ff:ff:ff": - self.netdevices[dev].set(("hwaddr", hwaddr)) - except Exception, e: - log.error("exception getting mac addr: %s" %(e,)) + + try: + hwaddr = isys.getMacAddress(dev) + if rhpl.getArch() != "s390" and hwaddr and hwaddr != "00:00:00:00:00:00" and hwaddr != "ff:ff:ff:ff:ff:ff": + self.netdevices[dev].set(("hwaddr", hwaddr)) + except Exception, e: + log.error("exception getting mac addr: %s" %(e,)) if ksdevice and self.netdevices.has_key(ksdevice): self.firstnetdevice = ksdevice |