Convert all Debian (and derivative) templates from using 'arch' to using 'dpkg -...

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 27c041e6d29b07ef5d8491e2c9459de18f19644a..75a33a4064c877be59573e0fd8be9e833e7cbc12 100644 (file)
--- 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 0f3798891854fbee66bf3fd1a74b6216052abe17..3720dced2f4fbf4d7e12e78d3f8af9bdcb1b6923 100644 (file)
--- 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 fe613139bba072fcd056b08515d2ceeaba4d5df1..88a4618e297accd2684e0c8835ebe5b43ea28a29 100644 (file)
--- 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 0a8ac8e9301be20f8c42c5510d0e7f29538adcbd..23ecefab0eafb882177d52d54d1b2f2e68ab02b0 100644 (file)
--- 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 e7e38594b5bd250d36381af2c311f6c88a2c10af..8211c1edfcdd67708b8d98bba79c5ff536d8d6ce 100644 (file)
--- 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