[master&rhel6-branch 5/8] Allow loader to parse DNS and write DNS1, DNS2, ... itself (again). (#595388)

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

 



---
 loader/linuxrc.s390 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 11d97a6..7badbe5 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -3028,8 +3028,16 @@ NETMASK=$NETMASK
 GATEWAY=$GATEWAY
 EOF
 fi
+# real DNS config for NetworkManager to generate /etc/resolv.conf
 [ "$DNS1" != "" ] && echo "DNS1=$DNS1" >> $IFCFGFILE
 [ "$DNS2" != "" ] && echo "DNS2=$DNS2" >> $IFCFGFILE
+# just to please loader's readNetInfo && writeEnabledNetInfo
+# which eats DNS1,DNS2,... and generates it themselves based on DNS
+if [ "$ipv6" ]; then
+    [ "$DNS" != "" ] && echo "DNS=\"$DNS\"" >> $IFCFGFILE
+else
+    [ "$DNS" != "" ] && echo "DNS=\"$(echo $DNS|sed -e 's/:/,/g')\"" >> $IFCFGFILE
+fi
 # colons in SEARCHDNS already replaced with spaces above for /etc/resolv.conf
 [ "$SEARCHDNS" != "" ] && echo "DOMAIN=\"$SEARCHDNS\"" >> $IFCFGFILE
 [ "$NETTYPE" != "" ] && echo "NETTYPE=$NETTYPE" >> $IFCFGFILE
-- 
1.7.0.4


_______________________________________________
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