From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 28 Sep 2015 19:43:10 +0000 (-0400)
Subject: lxc-debian: We should only check the kernel architecture.
X-Git-Tag: lxc-2.0.0.beta1~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4963978bb6e8f4eafc73bf0a3e93278b704ce784;p=thirdparty%2Flxc.git

lxc-debian: We should only check the kernel architecture.

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>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index df63bb14e..c887cc18c 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -499,17 +499,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