Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Manuel Munz 2012-06-27 17:54:16 +00:00
parent dbeb9c5499
commit 016a39fd8a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
View file

@ -33,7 +33,7 @@ handle_interfacedefaults() {
config_foreach handle_interfacedefaults InterfaceDefaults config_foreach handle_interfacedefaults InterfaceDefaults
# Set basic olsrd settings # Set basic olsrd settings
if [ "$profile_ipv6" = 1 ]; then if [ "$profile_ipv6" = 1 ] && [ "$has_ipv6" == "1" ]; then
uci set olsrd.olsrd.IpVersion="6and4" uci set olsrd.olsrd.IpVersion="6and4"
fi fi
uci_commitverbose "Setup olsr basic settings" olsrd uci_commitverbose "Setup olsr basic settings" olsrd

2
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
View file

@ -18,7 +18,7 @@ echo "
# config # config
export dir="/usr/bin/meshwizard" export dir="/usr/bin/meshwizard"
. $dir/functions.sh . $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 # Check which packages we have installed
export has_luci=FALSE export has_luci=FALSE