projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d21dc5c
)
contrib/meshwizard: IPv6 fixes
author
Manuel Munz
<freifunk@somakoma.de>
Thu, 2 Aug 2012 14:41:30 +0000
(14:41 +0000)
committer
Manuel Munz
<freifunk@somakoma.de>
Thu, 2 Aug 2012 14:41:30 +0000
(14:41 +0000)
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
[new file with mode: 0755]
patch
|
blob
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6.sh
patch
|
blob
|
history
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
new file mode 100755
(executable)
index 0000000..
adf3429
--- /dev/null
+++ b/
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_auto-ipv6-interface.sh
@@ -0,0
+1,12
@@
+#!/bin/sh
+
+net=$1
+. $dir/functions.sh
+
+ra="$(uci -q get meshwizard.netconfig.${net}_ipv6ra)"
+uci set autoipv6.${netrenamed}="interface"
+if [ -n "$ra" ]; then
+ uci set autoipv6.${netrenamed}.ra=1
+fi
+
+uci_commitverbose "Setup auto-ipv6 for interface $netrenamed" autoipv6
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
edbbbc4
..
d44600b
100755
(executable)
--- 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,12
+2,12
@@
. $dir/functions.sh
. $dir/functions.sh
-# Setup auto-ipv6
-
-if [ "$profile_ipv6_config" = "auto-ipv6-dhcpv6" ]; then
- uci set autoipv6.olsr_node.enable=1
- uci_commitverbose "Setup auto-ipv6 for dhcpv6 mode" autoipv6
+if [ "$general_ipv6_config" = "auto-ipv6-fromv4" ]; then
+ mode="fromv4"
+else
+ mode="random"
fi
fi
-
-
+uci set autoipv6.olsr_node.enabled=1
+uci set autoipv6.olsr_node.mode="$mode"
+uci_commitverbose "Setup auto-ipv6" autoipv6