From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 24 May 2011 18:19:08 +0000 (-0400)
Subject: Convert all Debian (and derivative) templates from using 'arch' to using 'dpkg -... 
X-Git-Tag: lxc-0.7.5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3930b7453e9b6d3cc77bf8433f04c446da949060;p=thirdparty%2Flxc.git

Convert all Debian (and derivative) templates from using 'arch' to using 'dpkg --print-architecture' as debootstrap does
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 27c041e6d..75a33a406 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -158,14 +158,7 @@ install_debian()
 	    return 1
 	fi
 
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
+	arch=$(dpkg --print-architecture)
 
 	echo "Checking cache download in $cache/rootfs-$SUITE-$arch ... "
 	if [ ! -e "$cache/rootfs-$SUITE-$arch" ]; then
diff --git a/templates/lxc-lenny.in b/templates/lxc-lenny.in
index 0f3798891..3720dced2 100644
--- a/templates/lxc-lenny.in
+++ b/templates/lxc-lenny.in
@@ -148,14 +148,7 @@ install_debian()
 	    return 1
 	fi
 
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
+	arch=$(dpkg --print-architecture)
 
 	echo "Checking cache download in $cache/rootfs-$SUITE-$arch ... "
 	if [ ! -e "$cache/rootfs-$SUITE-$arch" ]; then
diff --git a/templates/lxc-lucid.in b/templates/lxc-lucid.in
index fe613139b..88a4618e2 100644
--- a/templates/lxc-lucid.in
+++ b/templates/lxc-lucid.in
@@ -194,14 +194,7 @@ install_ubuntu()
 	    return 1
 	fi
 
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
+	arch=$(dpkg --print-architecture)
 
 	echo "Checking cache download in $cache/rootfs-$arch ... "
 	if [ ! -e "$cache/rootfs-$arch" ]; then
diff --git a/templates/lxc-maverick.in b/templates/lxc-maverick.in
index 0a8ac8e93..23ecefab0 100644
--- a/templates/lxc-maverick.in
+++ b/templates/lxc-maverick.in
@@ -117,14 +117,7 @@ install_ubuntu()
 	    return 1
 	fi
 
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
+	arch=$(dpkg --print-architecture)
 
 	echo "Checking cache download in $cache/rootfs-$arch ... "
 	if [ ! -e "$cache/rootfs-$arch" ]; then
diff --git a/templates/lxc-natty.in b/templates/lxc-natty.in
index e7e38594b..8211c1edf 100644
--- a/templates/lxc-natty.in
+++ b/templates/lxc-natty.in
@@ -118,14 +118,7 @@ install_ubuntu()
 	    return 1
 	fi
 
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
+	arch=$(dpkg --print-architecture)
 
 	echo "Checking cache download in $cache/rootfs-$arch ... "
 	if [ ! -e "$cache/rootfs-$arch" ]; then