summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--network.py5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d0a6ad95c..7c7c6a6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Chris Lumens <clumens@redhat.com>
+
+ * network.py (Network.available): Check for ff:ff:ff:ff:ff:ff as
+ well.
+
2005-11-28 David Cantrell <dcantrell@redhat.com>
* iw/release_notes_viewer_gui.py: Make the release notes viewer
diff --git a/network.py b/network.py
index 914c56af7..3058be43c 100644
--- a/network.py
+++ b/network.py
@@ -236,7 +236,7 @@ class Network:
continue
# add hwaddr
hwaddr = isys.getMacAddress(device)
- if hwaddr and hwaddr != "00:00:00:00:00:00":
+ if hwaddr and hwaddr != "00:00:00:00:00:00" and hwaddr != "ff:ff:ff:ff:ff:ff":
self.netdevices[device].set(("hwaddr", hwaddr))
def getDevice(self, device):
@@ -266,8 +266,7 @@ class Network:
self.netdevices[dev] = NetworkDevice(dev)
try:
hwaddr = isys.getMacAddress(dev)
- if (iutil.getArch() != "s390" and
- hwaddr and hwaddr != "00:00:00:00:00:00"):
+ if iutil.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,))