Backport scheme and uci fixes

diff --git a/libs/uci/luasrc/model/uci.lua b/libs/uci/luasrc/model/uci.lua
index 2385cc37ca3f3312773069947fdafed717d3847c..587cd63c0bba6fe5c8753fe8ee08bd2e1f8dbe22 100644 (file)
--- 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 726fdb7983e72ab06f7ecba65104b56386b38293..57d02a63e4cc5471f16ea1f3b1b56a7604889eb3 100644 (file)
--- 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 562d1a44e75d1e742dfdca31df69b9a12911cd0b..d148b9b335d9103c9c54f5d3abddfc6d589465e9 100644 (file)
--- 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 b27eaa6eb71e229cfbb10429063df8b7260781a4..99521225c31c4e88af2ac735853ffca1ef09102a 100644 (file)
--- 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