diff options
author | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2007-05-30 18:37:40 +0000 |
commit | d6ab17a42c932fa77919ba11aa73f09bfc715761 (patch) | |
tree | f0280851561d310603846bdfdfb66b90f21c12bf /network.py | |
parent | bc0ab0a4e273708468c80d95ea9c9eab024797d6 (diff) | |
download | anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.gz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.tar.xz anaconda-d6ab17a42c932fa77919ba11aa73f09bfc715761.zip |
(merges from f7-branch)
2007-05-30 Jeremy Katz <katzj@aglarond.local>
* isys/isys.py (_stopRaid): Fix raidstop. I have no clue how
things were working here...
* isys/isys.py (_getRaidInfo): raise ValueError when we don't find
a valid raid superblock (#151653).
* upgrade.py: More blacklist
* isys/isys.h (EARLY_SWAP_RAM): Let's bump RAM needs a little (#232862)
* iw/netconfig_dialog.py (NetworkConfigurator._handleIPError): Add
a frame so things look right
(NetworkConfigurator._ok): Set useipv4 to true, call netconfig
methods with the right args (#240804)
* network.py (hasActiveNetDev): Ensure we have an IP as
otherwise, the network device isn't really all that active.
Diffstat (limited to 'network.py')
-rw-r--r-- | network.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/network.py b/network.py index 474accb1f..f243c00d8 100644 --- a/network.py +++ b/network.py @@ -106,6 +106,14 @@ def hasActiveNetDev(): # try to load /tmp/netinfo and see if we can sniff out network info netinfo = Network() for dev in netinfo.netdevices.keys(): + try: + ip = isys.getIPAddress(dev) + except Exception, e: + log.error("Got an exception trying to get the ip addr of %s: " + "%s" %(dev, e)) + continue + if ip == '127.0.0.1' or ip is None: + continue if isys.getLinkStatus(dev): return True return False |