From: Dwight Engen <dwight.engen@oracle.com>
Date: Wed, 3 Apr 2013 21:08:32 +0000 (-0400)
Subject: debian template: set arch when dpkg doesn't exist on host
X-Git-Tag: lxc-1.0.0.alpha1~1^2~320
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6efdcb6a3cc4d06bf64af69b08bc95335f02b79f;p=thirdparty%2Flxc.git

debian template: set arch when dpkg doesn't exist on host

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 7bbc46b94..e36523c26 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -172,7 +172,18 @@ install_debian()
             return 1
         fi
 
-        arch=$(dpkg --print-architecture)
+        if which dpkg >/dev/null 2>&1 ; then
+            arch=$(dpkg --print-architecture)
+        else
+            arch=$(arch)
+            if [ "$arch" = "i686" ]; then
+                arch="i386"
+            elif [ "$arch" = "x86_64" ]; then
+                arch="amd64"
+            elif [ "$arch" = "armv7l" ]; then
+                arch="armhf"
+            fi
+        fi
 
         echo "Checking cache download in $cache/rootfs-$SUITE-$arch ... "
         if [ ! -e "$cache/rootfs-$SUITE-$arch" ]; then