]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc-debian: We should only check the kernel architecture.
authorStéphane Graber <stgraber@ubuntu.com>
Mon, 28 Sep 2015 19:43:10 +0000 (15:43 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 29 Sep 2015 16:40:38 +0000 (12:40 -0400)
The dpkg architecture isn't relevant to LXC, only the kernel arch is.

Signed-off-by: Gergely Szasz <szaszg@hu.inter.net>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
templates/lxc-debian.in

index dceb212941dbd6e03083f631f0eb03980a5a6c90..47d3dca53a4cbdea4c41016c3b391f6e7943c799 100644 (file)
@@ -480,17 +480,13 @@ if [ $? -ne 0 ]; then
 fi
 eval set -- "$options"
 
-if which dpkg > /dev/null 2>&1 ; then
-    arch=$(dpkg --print-architecture)
-else
-    arch=$(uname -m)
-    if [ "$arch" = "i686" ]; then
-        arch="i386"
-    elif [ "$arch" = "x86_64" ]; then
-        arch="amd64"
-    elif [ "$arch" = "armv7l" ]; then
-        arch="armhf"
-    fi
+arch=$(uname -m)
+if [ "$arch" = "i686" ]; then
+    arch="i386"
+elif [ "$arch" = "x86_64" ]; then
+    arch="amd64"
+elif [ "$arch" = "armv7l" ]; then
+    arch="armhf"
 fi
 hostarch=$arch