summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh2
-rwxr-xr-xcontrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
index d53fc3821..306cf9420 100755
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
@@ -33,7 +33,7 @@ handle_interfacedefaults() {
config_foreach handle_interfacedefaults InterfaceDefaults
# Set basic olsrd settings
-if [ "$profile_ipv6" = 1 ]; then
+if [ "$profile_ipv6" = 1 ] && [ "$has_ipv6" == "1" ]; then
uci set olsrd.olsrd.IpVersion="6and4"
fi
uci_commitverbose "Setup olsr basic settings" olsrd
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index 859d5ff6b..f159268d3 100755
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@ -18,7 +18,7 @@ echo "
# config
export dir="/usr/bin/meshwizard"
. $dir/functions.sh
-[ -f /proc/net/ipv6_route ] && has_ipv6=1
+[ -f /proc/net/ipv6_route ] && export has_ipv6=1
# Check which packages we have installed
export has_luci=FALSE