luci-0.8: merge r3828-r3829

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"

contrib/package/olsrd-luci/Makefile

@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
 PKG_VERSION:=0.5.6-r2+hg1724
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_HGREV:=cac1df64dcd5
 PKG_SOURCE:=$(PKG_HGREV).tar.gz

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