[PATCH 3/3] Do not write HWADDR to ifcfg file on s390x for OSA Layer 2 (#546005)

[David Cantrell <dcantrell@xxxxxxxxxx>]

On s390x, if an interface is in OSA layer 2 mode, do not write the
HWADDR setting to the ifcfg file.
---
 network.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/network.py b/network.py
index 24538e3..a3f6057 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 \
-- 
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list