projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meshwizard: ipv6 fixes, fix uhttpd setup
[project/luci.git]
/
contrib
/
package
/
meshwizard
/
files
/
usr
/
bin
/
meshwizard
/
wizard.sh
diff --git
a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index
f6b227d
..
41a6117
100755
(executable)
--- a/
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@
-60,6
+60,7
@@
$dir/helpers/setup_system.sh
$dir/helpers/setup_olsrd.sh
$dir/helpers/setup_firewall.sh
$dir/helpers/setup_ssh.sh
$dir/helpers/setup_olsrd.sh
$dir/helpers/setup_firewall.sh
$dir/helpers/setup_ssh.sh
+$dir/helpers/setup_uhttpd.sh
if [ "$wan_proto" == "static" ] && [ -n "$wan_ip4addr" ] && [ -n "$wan_netmask" ]; then
$dir/helpers/setup_wan_static.sh
if [ "$wan_proto" == "static" ] && [ -n "$wan_ip4addr" ] && [ -n "$wan_netmask" ]; then
$dir/helpers/setup_wan_static.sh
@@
-73,10
+74,10
@@
if [ "$lan_proto" == "static" ] && [ -n "$lan_ip4addr" ] && [ -n "$lan_netmask"
$dir/helpers/setup_lan_static.sh
fi
$dir/helpers/setup_lan_static.sh
fi
-if [ "$
profile_ipv6
" == 1 ] && [ "$has_ipv6" = 1 ]; then
+if [ "$
ipv6_enabled
" == 1 ] && [ "$has_ipv6" = 1 ]; then
$dir/helpers/setup_lan_ipv6.sh
# Setup auto-ipv6
$dir/helpers/setup_lan_ipv6.sh
# Setup auto-ipv6
- if [ -n "$(echo "$
profile_
ipv6_config" |grep auto-ipv6)" ]; then
+ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then
$dir/helpers/setup_auto-ipv6.sh
fi
fi
$dir/helpers/setup_auto-ipv6.sh
fi
fi
@@
-107,7
+108,7
@@
for net in $networks; do
$dir/helpers/setup_splash.sh $net
$dir/helpers/setup_firewall_interface.sh $net
$dir/helpers/setup_splash.sh $net
$dir/helpers/setup_firewall_interface.sh $net
- if [ -n "$(echo "$
profile_
ipv6_config" |grep auto-ipv6)" ]; then
+ if [ -n "$(echo "$ipv6_config" |grep auto-ipv6)" ]; then
$dir/helpers/setup_auto-ipv6-interface.sh $net
fi
done
$dir/helpers/setup_auto-ipv6-interface.sh $net
fi
done