From 70f54810a5f1be527a983e273d9474a99d75ee7d Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 26 May 2016 10:24:07 -0400
Subject: Use grep to decide when to add our comment
According to the man page for resolv.conf # needs to be in the first collumn in
order to start a comment. While this didn't seem to affect glibc's resolver it
did really confuse the kubelet which parses the host's resolv.conf
---
roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'roles')
diff --git a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
index 0d7941e4c..51a43d113 100755
--- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
+++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh
@@ -51,6 +51,9 @@ EOF
done
systemctl restart dnsmasq
- sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"' # updated by \/etc\/NetworkManager\/dispatcher.d\/99-origin-dns.sh/g' /etc/resolv.conf
+ sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"'/g' /etc/resolv.conf
+ if ! grep -q '99-origin-dns.sh' /etc/resolv.conf; then
+ echo "# nameserver updated by /etc/NetworkManager/dispatcher.d/99-origin-dns.sh" >> /etc/resolv.conf
+ fi
fi
fi
--
cgit v1.2.3