Merge "Improve Fedora build host support: architectures."

lib/img-defaults

@@ -14,7 +14,25 @@
 # under the License.
 
 # options for create-baremetal-image.sh
-export ARCH=${ARCH:-$(dpkg --print-architecture)}
+if [ -f /etc/debian_version ]; then
+  _ARCH=$(dpkg --print-architecture)
+else
+  _ARCH=$(uname -m)
+fi
+ARCH=${ARCH:-_ARCH}
+
+case $ARCH in
+  "x86_64")
+    ARCH="amd64"
+    ;;
+  "armv"*)
+    ARCH="armhf"
+    ;;
+  *)
+    echo "WARNING: Unknown architecture: $ARCH"
+    ;;
+esac
+
 FS_TYPE=${FS_TYPE:-ext4}
 # Used to set the file extension only at this stage.
 IMAGE_TYPE=${IMAGE_TYPE:-qcow2}