From: Steven Barth <steven@midlink.org>
Date: Sun, 14 Sep 2008 19:12:23 +0000 (+0000)
Subject: Backport scheme and uci fixes
X-Git-Tag: 0.8.0~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1932ef32943075256f7a5e085f02e1911a365887;p=oweals%2Fluci.git

Backport scheme and uci fixes
---

diff --git a/libs/uci/luasrc/model/uci.lua b/libs/uci/luasrc/model/uci.lua
index 2385cc37c..587cd63c0 100644
--- a/libs/uci/luasrc/model/uci.lua
+++ b/libs/uci/luasrc/model/uci.lua
@@ -77,7 +77,7 @@ function Cursor.delete_all(self, config, stype, comparator)
 		local tbl = comparator
 		comparator = function(section)
 			for k, v in pairs(tbl) do
-				if not section[k] == v then
+				if section[k] ~= v then
 					return false
 				end
 			end 
diff --git a/libs/uvl/root/lib/uci/schema/default/network b/libs/uvl/root/lib/uci/schema/default/network
index 726fdb798..57d02a63e 100644
--- a/libs/uvl/root/lib/uci/schema/default/network
+++ b/libs/uvl/root/lib/uci/schema/default/network
@@ -20,7 +20,6 @@ config variable
 	option name	'ifname'
 	option title	'Physical interface'
 	option section	'network.interface'
-	option required	true
 
 config variable
 	option name	'macaddr'
diff --git a/libs/uvl/root/lib/uci/schema/default/wireless b/libs/uvl/root/lib/uci/schema/default/wireless
index 562d1a44e..d148b9b33 100644
--- a/libs/uvl/root/lib/uci/schema/default/wireless
+++ b/libs/uvl/root/lib/uci/schema/default/wireless
@@ -25,7 +25,6 @@ config variable
 	option name 'channel'
 	option section 'wireless.wifi-device'
 	option title 'Channel'
-	option datatype uint
 
 config variable
 	option name 'mode'
diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index b27eaa6eb..99521225c 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -16,25 +16,25 @@ config settings wizard
 	    
 
 config fw_rule http
-	option source freifunk
+	option src freifunk
 	option target ACCEPT
 	option proto  tcp
 	option dest_port 80
 	
 config fw_rule https
-	option source freifunk
+	option src freifunk
 	option target ACCEPT
 	option proto  tcp
 	option dest_port 443
 	 
 config fw_rule ssh
-	option source freifunk
+	option src freifunk
 	option target ACCEPT
 	option proto  tcp
 	option dest_port 22
 
 config fw_rule olsr
-	option source freifunk
+	option src freifunk
 	option target ACCEPT
 	option proto  udp
 	option dest_port 698