mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #2865 from miska/lxc-luci-features 

Little improvement to LXC LuCI app
This commit is contained in:
champtar 2016-06-17 15:42:23 +03:00 committed by GitHub
parent 5731b8e09b b6d1ef53c3
commit 25af3a6632
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/luci-app-lxc/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-lxc
PKG_RELEASE:=20141012
PKG_RELEASE:=20160616
PKG_LICENSE:=Apache-2.0

34
utils/luci-app-lxc/files/controller/lxc.lua
View File

@ -59,6 +59,9 @@ function index()
page = entry({"admin", "services", "lxc_action"}, call("lxc_action"), nil)
page.leaf = true
page = entry({"admin", "services", "lxc_get_downloadable"}, call("lxc_get_downloadable"), nil)
page.leaf = true
page = entry({"admin", "services", "lxc_configuration_get"}, call("lxc_configuration_get"), nil)
page.leaf = true
@ -67,6 +70,27 @@ function index()
end
function lxc_get_downloadable()
luci.http.prepare_content("application/json")
local f = io.popen('uname -m', 'r')
local target = f:read('*a')
f:close()
target = target:gsub("^%s*(.-)%s*$", "%1")
local templates = {}
local f = io.popen('lxc-create -n just_want_to_list_available_lxc_templates -t download -- --list', 'r')
for line in f:lines() do
local dist,version = line:match("^(%S+)%s+(%S+)%s+" .. target .. "%s+default%s+%S+$")
if dist~=nil and version~=nil then templates[#templates + 1] = dist .. ":" .. version end
end
f:close()
luci.http.write_json(templates)
end
function lxc_create(lxc_name, lxc_template)
luci.http.prepare_content("text/plain")
@ -78,9 +102,15 @@ function lxc_create(lxc_name, lxc_template)
return luci.http.write("1")
end
local target = _G.DISTRIB_TARGET:match('([^/]+)')
local f = io.popen('uname -m', 'r')
local target = f:read('*a')
f:close()
target = target:gsub("^%s*(.-)%s*$", "%1")
local data = conn:call("lxc", "create", { name = lxc_name, template = "download", args = { "--server", url, "--no-validate", "--dist", lxc_template, "--release", "bb", "--arch", target } } )
local lxc_dist = lxc_template:gsub("(.*):(.*)", '%1')
local lxc_release = lxc_template:gsub("(.*):(.*)", '%2')
local data = conn:call("lxc", "create", { name = lxc_name, template = "download", args = { "--server", url, "--no-validate", "--dist", lxc_dist, "--release", lxc_release, "--arch", target } } )
luci.http.write(data)
end

19
utils/luci-app-lxc/files/view/lxc.htm
View File

@ -47,7 +47,6 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
</td>
<td>
<select id="s_template" class="cbi-input-select cbi-button">
<option value="openwrt">OpenWrt</option>
</select>
</td>
<td>
@ -438,4 +437,22 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
}
lxc_list_update()
new XHR().get('<%=luci.dispatcher.build_url("admin", "services")%>/lxc_get_downloadable', null,
function(x, data)
{
if (!x) return;
var lxc_count = Object.keys(data).length
if (!data || !lxc_count) return;
var select = document.getElementById("s_template");
for(var key in data)
{
var option = document.createElement('option');
option.value = data[key];
option.text = data[key].replace(/[_:]/, ' ');
select.add(option, -1);
}
})
//]]></script>