summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Nordell <jnordell@redhat.com>2016-05-23 21:41:27 +0200
committerJonas Nordell <jnordell@redhat.com>2016-05-23 21:41:27 +0200
commit396300e49bf48b116f239e8b4b5900dca3f99173 (patch)
tree7f0b9c8febf266e36821b1b9146c344ce0bfbc4c
parent6c86bd94b01a1d200fca865996c16a95ccaa7183 (diff)
downloadopenshift-396300e49bf48b116f239e8b4b5900dca3f99173.tar.gz
openshift-396300e49bf48b116f239e8b4b5900dca3f99173.tar.bz2
openshift-396300e49bf48b116f239e8b4b5900dca3f99173.tar.xz
openshift-396300e49bf48b116f239e8b4b5900dca3f99173.zip
Removed the echo line and replaced it with inline comment. To keep 99-origin-dns.sh from adding a new line in /etc/resolv.conf everytime the NetworkManager dispatcher script is executed.
-rwxr-xr-xroles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh3
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