summaryrefslogtreecommitdiffstats
path: root/installclass.py
diff options
context:
space:
mode:
authorPaul Nasrat <pnasrat@redhat.com>2005-02-08 14:37:30 +0000
committerPaul Nasrat <pnasrat@redhat.com>2005-02-08 14:37:30 +0000
commit82932ca1e79e26f3a3d5ca75ec0e4a3f035a3859 (patch)
tree39ba8352cc86bb0ceac39ced4442fe4d6c8ac96a /installclass.py
parent85c0b018dd9fb1c0780397fff333c6993e3f91ae (diff)
downloadanaconda-82932ca1e79e26f3a3d5ca75ec0e4a3f035a3859.tar.gz
anaconda-82932ca1e79e26f3a3d5ca75ec0e4a3f035a3859.tar.xz
anaconda-82932ca1e79e26f3a3d5ca75ec0e4a3f035a3859.zip
Put fixes for #138852 and #146915 on HEAD
Diffstat (limited to 'installclass.py')
-rw-r--r--installclass.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/installclass.py b/installclass.py
index 7daa2dfdc..1e433d788 100644
--- a/installclass.py
+++ b/installclass.py
@@ -320,11 +320,15 @@ class BaseInstallClass:
def setNetwork(self, id, bootProto, ip, netmask, ethtool, device = None, onboot = 1, dhcpclass = None, essid = None, wepkey = None):
if bootProto:
devices = id.network.available ()
+ firstdev = id.network.getFirstDeviceName()
if (devices and bootProto):
if not device:
- list = devices.keys ()
- list.sort()
- device = list[0]
+ if devices.has_key(firstdev):
+ device = firstdev
+ else:
+ list = devices.keys ()
+ list.sort()
+ device = list[0]
dev = devices[device]
dev.set (("bootproto", bootProto))
dev.set (("dhcpclass", dhcpclass))