diff options
Diffstat (limited to 'applications/luci-app-lxc/luasrc/controller/lxc.lua')
| -rw-r--r-- | applications/luci-app-lxc/luasrc/controller/lxc.lua | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/applications/luci-app-lxc/luasrc/controller/lxc.lua b/applications/luci-app-lxc/luasrc/controller/lxc.lua index 6fa1add0f8..1682def279 100644 --- a/applications/luci-app-lxc/luasrc/controller/lxc.lua +++ b/applications/luci-app-lxc/luasrc/controller/lxc.lua @@ -55,11 +55,10 @@ end function lxc_get_downloadable() local target = lxc_get_arch_target(url) - local ssl_status = lxc_get_ssl_status() local templates = {} - local f = io.popen('sh /usr/share/lxc/templates/lxc-download --list %s --server %s 2>/dev/null' - %{ ssl_status, url }, 'r') + local f = io.popen('sh /usr/share/lxc/templates/lxc-download --list --server %s 2>/dev/null' + %{ url }, 'r') local line for line in f:lines() do local dist, version, dist_target = line:match("^(%S+)%s+(%S+)%s+(%S+)%s+default%s+%S+$") @@ -80,10 +79,9 @@ function lxc_create(lxc_name, lxc_template) return end - local ssl_status = lxc_get_ssl_status() local lxc_dist, lxc_release = lxc_template:match("^(.+):(.+)$") - luci.sys.call('/usr/bin/lxc-create --quiet --name %s --bdev best --template download -- --dist %s --release %s --arch %s --server %s %s' - %{ lxc_name, lxc_dist, lxc_release, lxc_get_arch_target(url), url, ssl_status }) + luci.sys.call('/usr/bin/lxc-create --quiet --name %s --bdev best --template download -- --dist %s --release %s --arch %s --server %s' + %{ lxc_name, lxc_dist, lxc_release, lxc_get_arch_target(url), url }) while (nx.fs.access(path .. lxc_name .. "/partial")) do nx.nanosleep(1) @@ -180,13 +178,3 @@ function lxc_get_arch_target(url) end return target end - -function lxc_get_ssl_status() - local ssl_enabled = uci:get("lxc", "lxc", "ssl_enabled") - local ssl_status = "--no-validate" - - if ssl_enabled and ssl_enabled == "1" then - ssl_status = "" - end - return ssl_status -end |