[master&rhel6-branch 7/8] Don't let loader write HWADDR to ifcfg file on s390. (#595388)

[Steffen Maier <maier@xxxxxxxxxxxxxxxxxx>]

See also bug 546005 and bug 546005 or bug 591533.
---
 loader/net.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index 8e37a66..769c1d4 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1284,7 +1284,9 @@ int writeEnabledNetInfo(iface_t *iface) {
     }
 
     fprintf(fp, "DEVICE=%s\n", iface->device);
+#if !defined(__s390__) && !defined(__s390x__)
     fprintf(fp, "HWADDR=%s\n", iface_mac2str(iface->device));
+#endif
     fprintf(fp, "ONBOOT=yes\n");
 
     if (!FL_NOIPV4(flags)) {
-- 
1.7.0.4


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