luci-0.10: Merge r7868

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index 73eddc4dfa2809137417286a8800e1ac97491ac0..f58253bcccc5d5049a3f338d241378a28b8ed705 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@ -70,7 +70,7 @@ fi
 # Setup policyrouting if internet sharing is disabled and wan is not used for olsrd
 # Always disable it first to make sure its disabled when the user decied to share his internet
 uci set freifunk-policyrouting.pr.enable=0
-if [ ! "$sharenet" == 1 ] && [ ! "$(uci -q get meshwizard.netconfig.wan_proto)" == "olsr" ]; then
+if [ ! "$general_sharenet" == 1 ] && [ ! "$(uci -q get meshwizard.netconfig.wan_proto)" == "olsr" ]; then
        $dir/helpers/setup_policyrouting.sh
 fi