Skip to content

Commit

Permalink
lxc-debian: We should only check the kernel architecture.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stgraber committed Sep 29, 2015
1 parent 61ef7bc commit b3a9fe8
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions templates/lxc-debian.in
Expand Up @@ -497,17 +497,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

Expand Down

0 comments on commit b3a9fe8

Please sign in to comment.