summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2008-11-29 01:36:38 +0000
committerJo-Philipp Wich <jow@openwrt.org>2008-11-29 01:36:38 +0000
commitca6a85fd8363cbc789e660977b8879c4abe41ce0 (patch)
treeb3d517af787677187cf6309d22d444db08d81833
parent0d64b29b89289b0eb419ba433d930466b0ac6eaf (diff)
package/olsrd-luci: add exception for Ip6AddrType option
applications/luci-olsr: add support for Ip6AddrType option
-rw-r--r--applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua7
-rwxr-xr-xcontrib/package/olsrd-luci/files/etc/init.d/olsrd2
2 files changed, 8 insertions, 1 deletions
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 0f8bc4236..4da1c4060 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -114,6 +114,13 @@ i:option(Value, "MidValidityTime").optional = true
i:option(Value, "HnaInterval").optional = true
i:option(Value, "HnaValidityTime").optional = true
+ip6t = i:option(ListValue, "Ip6AddrType")
+ip6t:value("auto")
+ip6t:value("site-local")
+ip6t:value("unique-local")
+ip6t:value("global")
+ip6t.optional = true
+
adc = i:option(Flag, "AutoDetectChanges")
adc.enabled = "yes"
adc.disabled = "no"
diff --git a/contrib/package/olsrd-luci/files/etc/init.d/olsrd b/contrib/package/olsrd-luci/files/etc/init.d/olsrd
index 9aee7a366..aa2950acd 100755
--- a/contrib/package/olsrd-luci/files/etc/init.d/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/init.d/olsrd
@@ -124,7 +124,7 @@ olsrd_write_option() {
fi
if [ "$value" != "${value%%[G-Zg-z_-]*}" ]; then
- if [ "$value" != "yes" -a "$value" != "no" ]; then
+ if [ "$option" != "Ip6AddrType" -a "$value" != "yes" -a "$value" != "no" ]; then
value="\"$value\""
fi
fi