summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-07-13 17:16:19 +0000
committerChris Lumens <clumens@redhat.com>2005-07-13 17:16:19 +0000
commitcd73deea1854d612cb6b8f895d47cc40c9070a5a (patch)
treeff934e42e1ed9ecf6680305f3c334776953a42f8
parentc75d7ce65dd3b2e0dbfebfcb91691c6a1295b902 (diff)
downloadanaconda-cd73deea1854d612cb6b8f895d47cc40c9070a5a.tar.gz
anaconda-cd73deea1854d612cb6b8f895d47cc40c9070a5a.tar.xz
anaconda-cd73deea1854d612cb6b8f895d47cc40c9070a5a.zip
Fix multiple NICs in kickstart config files (#158566).
-rw-r--r--ChangeLog8
-rw-r--r--installclass.py2
-rw-r--r--network.py1
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d18e27efe..241e8f669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-13 Chris Lumens <clumens@redhat.com>
+
+ * installclass.py (BaseInstallClass.setNetwork): Use list of all
+ network devices so the firstdev is properly excluded and
+ multiple NICs works in kickstart (#158566).
+ * network.py (Network.__init__): Set firstnetdevice from
+ /tmp/netinfo as part of above.
+
2005-07-12 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c: Fix silly syntax error (pnasrat)
diff --git a/installclass.py b/installclass.py
index 76e980dee..f44643b44 100644
--- a/installclass.py
+++ b/installclass.py
@@ -319,7 +319,7 @@ 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 ()
+ devices = id.network.netdevices
firstdev = id.network.getFirstDeviceName()
if (devices and bootProto):
if not device:
diff --git a/network.py b/network.py
index efcab6d7c..1ae4988c9 100644
--- a/network.py
+++ b/network.py
@@ -175,6 +175,7 @@ class Network:
if len(netinf) >= 2:
info [netinf[0]] = string.strip(netinf[1])
self.netdevices [info["DEVICE"]] = NetworkDevice(info["DEVICE"])
+ self.firstnetdevice = info["DEVICE"]
for key in ("IPADDR", "NETMASK", "BOOTPROTO", "ONBOOT", "MTU",
"NETTYPE", "SUBCHANNELS", "PORTNAME", "CTCPROT",
"PEERID", "ESSID", "KEY"):