diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2012-08-02 16:40:24 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2012-08-02 16:40:24 +0000 |
| commit | 6574b8147c8067c6f2df124557f58bd10b18aaae (patch) | |
| tree | a0536d53c678457c084b553760778ed09dd343da | |
| parent | 71d4bb6f46eb55ff77cc0df734f2c649e1d795bd (diff) | |
contrib/meshwizard: enable auto-ipv6 in meshwizard, removed radvd config
3 files changed, 5 insertions, 31 deletions
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh index d44600b78..35ebc867d 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh @@ -2,7 +2,8 @@ . $dir/functions.sh -if [ "$general_ipv6_config" = "auto-ipv6-fromv4" ]; then +echo $profile_ipv6_config +if [ "$profile_ipv6_config" = "auto-ipv6-fromv4" ]; then mode="fromv4" else mode="random" diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_radvd_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_radvd_interface.sh deleted file mode 100755 index 2e13bb7e8..000000000 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_radvd_interface.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Sets up olsrd interfaces -# arg $1 = net - -net=$1 - -. /lib/functions.sh -. $dir/functions.sh - -uci batch << EOF - set radvd.${net}_iface=interface - set radvd.${net}_iface.interface="${net}" - set radvd.${net}_iface.AdvSendAdvert=1 - set radvd.${net}_iface.ignore=0 - set radvd.${net}_prefix=prefix - set radvd.${net}_prefix.interface="$net" - set radvd.${net}_prefix.ignore=0 -EOF - -if [ "$profile_ipv6_config" = "auto-ipv6-dhcpv6" ]; then - uci batch <<- EOF - set radvd.${net}_iface.AdvManagedFlag=1 - set radvd.${net}_prefix.AdvOnLink=0 - EOF -fi - -uci_commitverbose "Setup radvd for interface $net" radvd diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh index b45c83987..f6b227dce 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh @@ -76,7 +76,7 @@ fi if [ "$profile_ipv6" == 1 ] && [ "$has_ipv6" = 1 ]; then $dir/helpers/setup_lan_ipv6.sh # Setup auto-ipv6 - if [ "$profile_ipv6_config" = "auto-ipv6-dhcpv6" ]; then + if [ -n "$(echo "$profile_ipv6_config" |grep auto-ipv6)" ]; then $dir/helpers/setup_auto-ipv6.sh fi fi @@ -107,8 +107,8 @@ for net in $networks; do $dir/helpers/setup_splash.sh $net $dir/helpers/setup_firewall_interface.sh $net - if [ "$profile_ipv6" == 1 ] && [ "$has_ipv6" = 1 ]; then - $dir/helpers/setup_radvd_interface.sh $net + if [ -n "$(echo "$profile_ipv6_config" |grep auto-ipv6)" ]; then + $dir/helpers/setup_auto-ipv6-interface.sh $net fi done |