diff options
author | Jason DeTiberus <detiber@gmail.com> | 2016-05-23 22:22:25 -0400 |
---|---|---|
committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-23 22:22:25 -0400 |
commit | 9ec0e180086b9a999d19dcc84da327ce29ed43e7 (patch) | |
tree | 13309ade61096dd29807acbe37374db1f295860f | |
parent | 2c2b22eef4528d7c829aef525ccabccef17863ea (diff) | |
parent | 396300e49bf48b116f239e8b4b5900dca3f99173 (diff) | |
download | openshift-9ec0e180086b9a999d19dcc84da327ce29ed43e7.tar.gz openshift-9ec0e180086b9a999d19dcc84da327ce29ed43e7.tar.bz2 openshift-9ec0e180086b9a999d19dcc84da327ce29ed43e7.tar.xz openshift-9ec0e180086b9a999d19dcc84da327ce29ed43e7.zip |
Merge pull request #1932 from jnordell/99-origin-dns
99-origin-dns.sh adds a comment to /etc/resolv.conf on every execution of NetworkManager dispatcher
-rwxr-xr-x | roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh | 3 |
1 files changed, 1 insertions, 2 deletions
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 09bae1777..0d7941e4c 100755 --- a/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh +++ b/roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh @@ -51,7 +51,6 @@ EOF done systemctl restart dnsmasq - sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"'/g' /etc/resolv.conf - echo "# nameserver updated by /etc/NetworkManager/dispatcher.d/99-origin-dns.sh" >> /etc/resolv.conf + sed -i 's/^nameserver.*$/nameserver '"${def_route_ip}"' # updated by \/etc\/NetworkManager\/dispatcher.d\/99-origin-dns.sh/g' /etc/resolv.conf fi fi |