瀏覽代碼

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
Jason DeTiberus 9 年之前
父節點
當前提交
9ec0e18008
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh

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