diff options
| author |   Serge Hallyn <serge.hallyn@ubuntu.com> | 2011-06-25 15:17:47 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2011-06-25 15:17:47 +0200 |
| commit | 8339b4c86a111a38e398f576318632491facb7ad (patch) | |
| tree | 208d86e0db84f39180052c623269acd73bc7b951 /templates | |
| parent | consolidate ubuntu templates (diff) | |
| download | lxc-8339b4c86a111a38e398f576318632491facb7ad.tar.gz lxc-8339b4c86a111a38e398f576318632491facb7ad.tar.bz2 lxc-8339b4c86a111a38e398f576318632491facb7ad.zip | |
lxc-ubuntu: Base arch detection code on debootstrap's with some additions when we don't have dpkg or udpkg
Changelog: [seh] Don't take arch from environment
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/lxc-ubuntu.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in index e73baa8..0a55f4c 100644 --- a/templates/lxc-ubuntu.in +++ b/templates/lxc-ubuntu.in @@ -393,14 +393,24 @@ eval set -- "$options" release=lucid bindhome= arch=$(arch) -trim_container=0 -if [ "$arch" == "x86_64" ]; then arch=amd64 -fi -if [ "$arch" == "i686" ]; then - arch=i386 +# Code taken from debootstrap +if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then + arch=`/usr/bin/dpkg --print-architecture` +elif type udpkg >/dev/null 2>&1 && udpkg --print-architecture >/dev/null 2>&1; then + arch=`/usr/bin/udpkg --print-architecture` +else + arch=$(arch) + if [ "$arch" = "i686" ]; then + arch="i386" + elif [ "$arch" = "x86_64" ]; then + arch="amd64" + elif [ "$arch" = "armv7l" ]; then + arch="armel" + fi fi +trim_container=0 hostarch=$arch while true do |