Browse Source

Revert dns changes

Bob Mottram 9 years ago
parent
commit
ec958bbd66
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      src/freedombone
  2. 1
    1
      src/freedombone-client

+ 2
- 2
src/freedombone View File

@@ -2044,7 +2044,7 @@ function mesh_babel {
2044 2044
   echo '    sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
2045 2045
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
2046 2046
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $babel_script
2047
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $babel_script
2047
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $babel_script
2048 2048
   echo '    systemctl restart avahi-daemon' >> $babel_script
2049 2049
   echo 'fi' >> $babel_script
2050 2050
   echo '' >> $babel_script
@@ -2146,7 +2146,7 @@ function mesh_batman_bridge {
2146 2146
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
2147 2147
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
2148 2148
   echo '    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
2149
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $batman_script
2149
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script
2150 2150
   echo 'fi' >> $batman_script
2151 2151
   echo '' >> $batman_script
2152 2152
   echo '# Mesh definition' >> $batman_script

+ 1
- 1
src/freedombone-client View File

@@ -235,7 +235,7 @@ function mesh_batman {
235 235
   echo '    sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
236 236
   echo '    sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
237 237
   echo '    sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script
238
-  echo '    sed -i "s|hosts:.*|hosts:          files dns|g" /etc/nsswitch.conf' >> $batman_script
238
+  echo '    sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script
239 239
   echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
240 240
   echo '        systemctl restart avahi-daemon' >> $batman_script
241 241
   echo '    else' >> $batman_script