[x-wrt] r4826 committed - Remove auto create intreface from coovachilli...
codesite...@google.com
Author: fof...@gmail.com
Date: Tue Sep 8 07:26:01 2009
Log: Remove auto create intreface from coovachilli
check
m-route/Makefile
webif-iw-lua-freeradius/Makefile
webif-iw-lua-mroute/Makefile
webif-iw-lua-olsr/Makefile
http://code.google.com/p/x-wrt/source/detail?r=4826
Modified:
/trunk/package/m-route/Makefile
/trunk/package/webif-iw-lua-coovachilli/Makefile
/trunk/package/webif-iw-lua-coovachilli/files/usr/lib/lua/lua-xwrt/pkgs/coovaportal.lua
/trunk/package/webif-iw-lua-coovachilli/files/www/cgi-bin/webif/coovachilli.sh
/trunk/package/webif-iw-lua-freeradius/Makefile
/trunk/package/webif-iw-lua-mroute/Makefile
/trunk/package/webif-iw-lua-olsr/Makefile
=======================================
--- /trunk/package/m-route/Makefile Thu Sep 3 00:15:33 2009
+++ /trunk/package/m-route/Makefile Tue Sep 8 07:26:01 2009
@@ -20,7 +20,6 @@
define Package/m-route/install
$(CP) -a ./files/* $(1)/
- mkdir -p $(1)/CONTROL
$(INSTALL_BIN) ./files/etc/hotplug.d/iface/* $(1)/etc/hotplug.d/iface/
$(INSTALL_BIN) ./files/lib/mroute/* $(1)/lib/mroute/
endef
=======================================
--- /trunk/package/webif-iw-lua-coovachilli/Makefile Fri Aug 14 07:21:40
2009
+++ /trunk/package/webif-iw-lua-coovachilli/Makefile Tue Sep 8 07:26:01
2009
@@ -12,7 +12,7 @@
SECTION:=admin
CATEGORY:=Administration
SUBMENU:=webif
- DEPENDS:=+haserl +lua +liblua +libuci-lua
+ DEPENDS:=+webif-iw-lua
TITLE:=coovachilli Configuration Script in LUA
endef
@@ -23,6 +23,7 @@
$(CP) -a ./files/* $(1)/
$(INSTALL_BIN) ./files/etc/init.d/chilli $(1)/etc/init.d/chilli
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/applys/*
$(1)/usr/lib/lua/lua-xwrt/applys/
+ $(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/pkgs/coovaportal.lua
$(1)/usr/lib/lua/lua-xwrt/pkgs/coovaportal.lua
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/pkgs/coovachilli/*
$(1)/usr/lib/lua/lua-xwrt/pkgs/coovachilli/
$(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/
$(INSTALL_BIN) ./files/www/cgi-bin/login/* $(1)/www/cgi-bin/login/
=======================================
---
/trunk/package/webif-iw-lua-coovachilli/files/usr/lib/lua/lua-xwrt/pkgs/coovaportal.lua
Sat Jun 13 16:14:29 2009
+++
/trunk/package/webif-iw-lua-coovachilli/files/usr/lib/lua/lua-xwrt/pkgs/coovaportal.lua
Tue Sep 8 07:26:01 2009
@@ -35,7 +35,6 @@
local tbformClass = tbformClass
-- no more external access after this point
setfenv(1, P)
-
if __FORM.pageremove and __FORM.pageremove ~= "" then
os.execute("rm "..uci.get("chillipages",__FORM.pageremove,"filename"))
uci.delete("chillipages",__FORM.pageremove)
@@ -222,9 +221,11 @@
if user_level < 2 then
filternet["lan"] = ""
end
+--[[
uci.check_set("network","wifi","interface")
uci.check_set("network","wifi","proto","static")
uci.check_set("network","wifi","type","bridge")
+]]--
-- uci.check_set("network","wifi","ifname",iwifi[i].device)
-- uci.check_set("network","wifi","ipaddr","192.168.2.2")
-- uci.check_set("network","wifi","netmask","255.255.255.0")
@@ -232,17 +233,20 @@
local nets = net.networks()
local iwifi = uci.get_type("wireless","wifi-iface")
- for i, u in pairs(nets) do
- if filternet[i] == nil then
- for j=1, #iwifi do
- local name = i.." on "..iwifi[j].device
- t[name]=i..":"..iwifi[j].device
- n = n + 1
+ if iwifi then
+ for i, u in pairs(nets) do
+ if filternet[i] == nil then
+ for j=1, #iwifi do
+ local name = i.." on "..iwifi[j].device
+ t[name]=i..":"..iwifi[j].device
+ n = n + 1
+ end
end
end
+ local unico = next(t)
+ return t, n, t[unico]
end
- local unico = next(t)
- return t, n, t[unico]
+ return nil, nil, nil
end
function core_form(form,user_level,rad_conf)
@@ -317,6 +321,8 @@
local user_level = user_level or userlevel
local form = form
local ifiw, n, unico = get_wifinet(user_level)
+
+ if n ~= nil then
if user_level > 1 or n > 1 then
if form == nil then
form = formClass.new(tr("Network Settings"))
@@ -333,11 +339,13 @@
end
end
else
- uci.set("coovachilli","webadmin","HS_LANIF",unico)
- uci.save("coovachilli")
+ if unico then
+ uci.set("coovachilli","webadmin","HS_LANIF",unico)
+ uci.save("coovachilli")
+ end
end
-
- if user_level > 1 then
+ end
+ if user_level > 1 or unico == nil then
local dev
dev = net.invert_dev_list() -- for advanced users
=======================================
--- /trunk/package/webif-iw-lua-freeradius/Makefile Fri Aug 14 11:45:08 2009
+++ /trunk/package/webif-iw-lua-freeradius/Makefile Tue Sep 8 07:26:01 2009
@@ -12,7 +12,7 @@
SECTION:=admin
CATEGORY:=Administration
SUBMENU:=webif
- DEPENDS:=+haserl +lua +liblua +libuci-lua +luac +webif-iw-lua
+ DEPENDS:=+webif-iw-lua
TITLE:=freeradius Configuration Script in LUA
endef
@@ -21,6 +21,7 @@
define Package/webif-iw-lua-freeradius/install
$(CP) -a ./files/* $(1)/
+ $(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/applys/*
$(1)/usr/lib/lua/lua-xwrt/applys/
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/pkgs/*
$(1)/usr/lib/lua/lua-xwrt/pkgs/
$(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/
=======================================
--- /trunk/package/webif-iw-lua-mroute/Makefile Fri Aug 14 11:56:57 2009
+++ /trunk/package/webif-iw-lua-mroute/Makefile Tue Sep 8 07:26:01 2009
@@ -1,6 +1,6 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=webif-iw-lua-mroute
+PKG_NAME:=webif-iw-lua-coovachilli
PKG_VERSION:=0.1
PKG_RELEASE:=1
@@ -12,7 +12,7 @@
SECTION:=admin
CATEGORY:=Administration
SUBMENU:=webif
- DEPENDS:=+m-route
+ DEPENDS:=+m-route +webif-iw-lua
TITLE:=M-Route Configuration Script in LUA
endef
@@ -21,6 +21,7 @@
define Package/webif-iw-lua-mroute/install
$(CP) -a ./files/* $(1)/
+ $(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/applys/*
$(1)/usr/lib/lua/lua-xwrt/applys/
$(INSTALL_BIN) ./files/usr/lib/lua/lua-xwrt/pkgs/*
$(1)/usr/lib/lua/lua-xwrt/pkgs/
$(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/
=======================================
--- /trunk/package/webif-iw-lua-olsr/Makefile Thu Sep 3 00:15:33 2009
+++ /trunk/package/webif-iw-lua-olsr/Makefile Tue Sep 8 07:26:01 2009
@@ -12,7 +12,7 @@
SECTION:=admin
CATEGORY:=Administration
SUBMENU:=webif
- DEPENDS:=+haserl +lua +liblua +libuci-lua +luac +webif-iw-lua
+ DEPENDS:=+webif-iw-lua
TITLE:=Olsrd configuration Script in LUA
endef
@@ -27,6 +27,10 @@
$(INSTALL_BIN) ./files/www/cgi-bin/webif/* $(1)/www/cgi-bin/webif/
rm -rf $(1)/usr/lib/webif/lang/
rm -f $(1)/www/cgi-bin/webif/*.wip
+
+ find $(1) -name CVS | xargs rm -rf
+ find $(1) -name .svn | xargs rm -rf
+ find $(1) -name *~ | xargs rm -rf
endef
$(eval $(call BuildPackage,webif-iw-lua-olsr))