contrib/meshwizard: Only setup 6and4 for olsrd if ipv6 is available

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 d53fc3821ffeeb607676303f3d5af0358e946e68..306cf94200d1a945476ecea39edcc9cc2d6db6ec 100755 (executable)
--- 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 859d5ff6b6285fdc760c1741149f981c660f0dbd..f159268d3e5e91646688606123069576e9a0ec79 100755 (executable)
--- 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