luci-app-lxc: Use uname -m as architecture
authorMichal Hrusecky <michal.hrusecky@nic.cz>
Thu, 16 Jun 2016 08:49:23 +0000 (10:49 +0200)
committerMichal Hrusecky <michal.hrusecky@nic.cz>
Thu, 16 Jun 2016 08:49:23 +0000 (10:49 +0200)
As containers are basically virtual machines, it should not depend on the
build target but on the real hardware architecture. For example there is plenty
of ARM families (mvebu, sunxi, ...) but all armv7l arms should be able to run
armv7l containers.

Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
utils/luci-app-lxc/files/controller/lxc.lua

index 6c28d4159f903cde64c4f7bff3f21b7ed14d856a..3d1b23df857efa1ea68fc5fe88683c957603c5e7 100644 (file)
@@ -78,7 +78,10 @@ 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 lxc_dist = lxc_template:gsub("(.*):(.*)", '%1')
        local lxc_release = lxc_template:gsub("(.*):(.*)", '%2')