diff options
| author | David Cantrell <dcantrell@redhat.com> | 2010-01-12 07:17:48 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2010-01-13 09:33:12 -1000 |
| commit | 3b0f398a4f1b2921e2c4c22b671775499196be75 (patch) | |
| tree | 6cfd298c2e378bf68432f7fad99bdf51deb4c85e /network.py | |
| parent | 6fd1cc12f95eaba13896a37eb48279a21b4e41cd (diff) | |
| download | anaconda-3b0f398a4f1b2921e2c4c22b671775499196be75.tar.gz anaconda-3b0f398a4f1b2921e2c4c22b671775499196be75.tar.xz anaconda-3b0f398a4f1b2921e2c4c22b671775499196be75.zip | |
Do not write HWADDR to ifcfg file on s390x for OSA Layer 2 (#546005)
On s390x, if an interface is in OSA layer 2 mode, do not write the
HWADDR setting to the ifcfg file.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/network.py b/network.py index 24538e3f3..a3f6057cf 100644 --- a/network.py +++ b/network.py @@ -244,6 +244,9 @@ class NetworkDevice(SimpleConfigFile): keys.remove("DESC") if "KEY" in keys: keys.remove("KEY") + 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 \ |