diff options
| author | David Cantrell <dcantrell@redhat.com> | 2010-02-11 11:11:51 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2010-02-11 11:11:51 -1000 |
| commit | 38dd6b93704a739624a2669e24e613a74c5aaca0 (patch) | |
| tree | cf97d4334a67785538bc1a350445563388e08be6 | |
| parent | 84904cdfc5b6822ac62c39694b07eb323b59b2f3 (diff) | |
| download | anaconda-38dd6b93704a739624a2669e24e613a74c5aaca0.tar.gz anaconda-38dd6b93704a739624a2669e24e613a74c5aaca0.tar.xz anaconda-38dd6b93704a739624a2669e24e613a74c5aaca0.zip | |
Revert "Write ARP=no to ifcfg file when VSWITCH=1 is set on s390x (#561926)."
This reverts commit 3b90bea90eb3c65f34e358babcb866b1514a4994.
ARP=no did not actually fix the problem with VSWITCH=1, nor did ARP=yes.
The problem was found to be in the /lib/udev/ccw_init file, which is
part of initscripts. The ifup script is not able to handle the
asynchronous bring up of s390x network devices.
| -rw-r--r-- | loader/linuxrc.s390 | 1 | ||||
| -rw-r--r-- | network.py | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 6a8d2c227..485002117 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -3052,7 +3052,6 @@ fi [ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> $IFCFGFILE [ "$CTCPROT" != "" ] && echo "CTCPROT=$CTCPROT" >> $IFCFGFILE [ "$MACADDR" != "" ] && echo "MACADDR=$MACADDR" >> $IFCFGFILE -[ "$VSWITCH" != "" ] && echo "VSWITCH=$VSWITCH" >> $IFCFGFILE optstr="" for option in LAYER2 PORTNO; do [ -z "${!option}" ] && continue diff --git a/network.py b/network.py index 83b999888..a3fb8ee9e 100644 --- a/network.py +++ b/network.py @@ -244,16 +244,9 @@ class NetworkDevice(SimpleConfigFile): keys.remove("DESC") if "KEY" in keys: keys.remove("KEY") - if iutil.isS390() and ("OPTIONS" in keys): - if self.info["OPTIONS"].find("layer2=1") != -1: - if "HWADDR" in keys: - keys.remove("HWADDR") - - if ("VSWITCH" in keys) and (self.info["VSWITCH"] == "1"): - keys.append("ARP") - self.info["ARP"] = "no" - if "VSWITCH" in keys: - keys.remove("VSWITCH") + if iutil.isS390() and ("OPTIONS" in keys) and ("HWADDR" in keys) and \ + (self.info["OPTIONS"].find("layer2=1") != -1): + keys.remove("HWADDR") for key in keys: if (key == 'NAME') or \ |