Browse Source

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
Scott Dodson 8 years ago
parent
commit
70f54810a5

+ 4 - 1
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