From c9ff98c8486babb2d06a601cde9df91904b96024 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 11 Sep 2015 22:14:53 +0100 Subject: [PATCH] Try disallowing other stacks --- src/freedombone | 5 +++-- src/freedombone-client | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/freedombone b/src/freedombone index 41f6dd89..86c945f4 100755 --- a/src/freedombone +++ b/src/freedombone @@ -2045,7 +2045,7 @@ function mesh_babel { echo ' sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $babel_script echo ' sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $babel_script echo ' sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $babel_script - echo ' sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $babel_script + echo ' sed -i "s|hosts:.*|hosts: files dns|g" /etc/nsswitch.conf' >> $babel_script echo ' systemctl restart avahi-daemon' >> $babel_script echo 'fi' >> $babel_script echo '' >> $babel_script @@ -2146,7 +2146,8 @@ function mesh_batman_bridge { echo ' sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script echo ' sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script echo ' sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script - echo ' sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script + echo ' sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script + echo ' sed -i "s|hosts:.*|hosts: files dns|g" /etc/nsswitch.conf' >> $batman_script echo 'fi' >> $batman_script echo '' >> $batman_script echo '# Mesh definition' >> $batman_script diff --git a/src/freedombone-client b/src/freedombone-client index 088dbeb1..7bffe03b 100755 --- a/src/freedombone-client +++ b/src/freedombone-client @@ -234,7 +234,8 @@ function mesh_batman { echo ' sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf' >> $batman_script echo ' sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script echo ' sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf' >> $batman_script - echo ' sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf' >> $batman_script + echo ' sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf' >> $batman_script + echo ' sed -i "s|hosts:.*|hosts: files dns|g" /etc/nsswitch.conf' >> $batman_script echo ' if [ -f /bin/systemctl ]; then' >> $batman_script echo ' systemctl restart avahi-daemon' >> $batman_script echo ' else' >> $batman_script