Merge pull request #308 from chris5560/master

luci-app-privoxy: move from openwrt/packages to openwrt/luci

diff --git a/libs/luci-lib-ip/src/ip.c b/libs/luci-lib-ip/src/ip.c
index c799419..5bff693 100644 (file)
--- a/libs/luci-lib-ip/src/ip.c
+++ b/libs/luci-lib-ip/src/ip.c
@@ -1270,7 +1270,9 @@ static int link_get(lua_State *L)
        lua_newtable(L);
 
        nl_send_auto_complete(sock, msg);
-       nl_recvmsgs(sock, cb);
+
+       while (st.pending > 0)
+               nl_recvmsgs(sock, cb);
 
        nlmsg_free(msg);
        nl_cb_put(cb);

diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index 055142b..52e347d 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
@@ -178,13 +178,7 @@ function action_flashops()
        local image_tmp   = "/tmp/firmware.img"
 
        local function image_supported()
-               -- XXX: yay...
-               return ( 0 == os.execute(
-                       ". /lib/functions.sh; " ..
-                       "include /lib/upgrade; " ..
-                       "platform_check_image %q >/dev/null"
-                               % image_tmp
-               ) )
+               return (os.execute("sysupgrade -T %q >/dev/null" % image_tmp) == 0)
        end
 
        local function image_checksum()