[PATCH 5/5] Simplify HWADDR removal check on s390x (#546005)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We do not want to write out HWADDR for any network device type on s390x.
---
 network.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/network.py b/network.py
index 0507b0d..f1bf128 100644
--- a/network.py
+++ b/network.py
@@ -244,8 +244,7 @@ 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):
+        if iutil.isS390() and ("HWADDR" in keys):
             keys.remove("HWADDR")
 
         for key in keys:
-- 
1.6.6.1

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

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux