From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 29 Nov 2008 01:36:38 +0000 (+0000)
Subject: package/olsrd-luci: add exception for Ip6AddrType option
X-Git-Tag: 0.9.0~942
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca6a85fd8363cbc789e660977b8879c4abe41ce0;p=oweals%2Fluci.git

package/olsrd-luci: add exception for Ip6AddrType option
applications/luci-olsr: add support for Ip6AddrType option
---

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