From a9ee38ff5f82ebfb650e2a3e5b229b2f5aa9c300 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Oct 2018 18:51:23 +0000
Subject: [PATCH] re-ordering
---
src/freedombone-app-pihole | 2 --
src/freedombone-image-customise | 2 +-
src/freedombone-utils-dns | 2 +-
src/freedombone-utils-mesh | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole
index cb4879077..46f2800ce 100755
--- a/src/freedombone-app-pihole
+++ b/src/freedombone-app-pihole
@@ -134,8 +134,6 @@ function pihole_update {
{ echo 'domain-needed';
echo 'bogus-priv';
echo 'no-resolv';
- echo 'local=/local/';
- echo 'domain=local';
echo "server=${PIHOLE_DNS1}";
echo "server=${PIHOLE_DNS2}";
echo "interface=${PIHOLE_IFACE}";
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 0235e9634..c05b93ae8 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2118,7 +2118,7 @@ sed -i 's|domain-name=.*|domain-name=local|g' "$rootdir/etc/avahi/avahi-daemon.c
sed -i "s|use-ipv4=.*|use-ipv4=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
-sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
+sed -i "s|hosts:.*|hosts: files mdns4_minimal mdns4 mdns dns|g" "$rootdir/etc/nsswitch.conf"
sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
sed -i "s|#publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index 20c3bba71..32a122266 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -97,7 +97,7 @@ EXTERNAL_IP_SERVICES=( \
function enable_mdns {
# files gw_name myhostname mdns4_minimal [NOTFOUND=return] dns
- sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
+ sed -i "s|hosts:.*|hosts: files mdns4_minimal mdns4 mdns dns|g" /etc/nsswitch.conf
}
function update_inadyn_config {
diff --git a/src/freedombone-utils-mesh b/src/freedombone-utils-mesh
index bd5ce6380..d7983d81a 100755
--- a/src/freedombone-utils-mesh
+++ b/src/freedombone-utils-mesh
@@ -60,7 +60,7 @@ function mesh_protocol_init {
sed -i "s|use-ipv4=.*|use-ipv4=no|g" /etc/avahi/avahi-daemon.conf
sed -i "s|use-ipv6=.*|use-ipv6=yes|g" /etc/avahi/avahi-daemon.conf
sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf
- sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
+ sed -i "s|hosts:.*|hosts: files mdns4_minimal mdns4 mdns dns|g" /etc/nsswitch.conf
fi
# Mesh definition
--
GitLab