openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix architecture filter."

This commit is contained in:
Jenkins 2013-05-02 20:37:58 +00:00 committed by Gerrit Code Review
parent d119c28f49 488c462dcd
commit f13570d322
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/img-defaults
View File

@ -18,20 +18,19 @@ if [ -f /etc/debian_version ]; then
_ARCH=$(dpkg --print-architecture)
else
_ARCH=$(uname -m)
case $_ARCH in
"x86_64")
_ARCH="amd64"
;;
"armv"*)
_ARCH="armhf"
;;
*)
echo "WARNING: Unknown architecture: $_ARCH"
;;
esac
fi
ARCH=${ARCH:-$_ARCH}
case $ARCH in
"x86_64")
ARCH="amd64"
;;
"armv"*)
ARCH="armhf"
;;
*)
echo "WARNING: Unknown architecture: $ARCH"
;;
esac
export ARCH
FS_TYPE=${FS_TYPE:-ext4}