Преглед изворни кода

Add valid search when search does not exist on resolv.conf

Kenjiro Nakayama пре 7 година
родитељ
комит
7f20af939e
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh

+ 3 - 3
roles/openshift_node_dnsmasq/files/networkmanager/99-origin-dns.sh

@@ -112,10 +112,10 @@ EOF
       fi
       sed -e '/^nameserver.*$/d' /etc/resolv.conf >> ${NEW_RESOLV_CONF}
       echo "nameserver "${def_route_ip}"" >> ${NEW_RESOLV_CONF}
-      if ! grep -q 'search.*cluster.local' ${NEW_RESOLV_CONF}; then
-        sed -i '/^search/ s/$/ cluster.local/' ${NEW_RESOLV_CONF}
-      elif ! grep -qw search ${NEW_RESOLV_CONF}; then
+      if ! grep -qw search ${NEW_RESOLV_CONF}; then
         echo 'search cluster.local' >> ${NEW_RESOLV_CONF}
+      elif ! grep -q 'search.*cluster.local' ${NEW_RESOLV_CONF}; then
+        sed -i '/^search/ s/$/ cluster.local/' ${NEW_RESOLV_CONF}
       fi
       cp -Z ${NEW_RESOLV_CONF} /etc/resolv.conf
     fi