Commit 725a0f88 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Remove the ARCH field from the image name

parent 7b8cdc65
......@@ -266,7 +266,6 @@ if [ -f "$DEFAULT_FILE" ]; then
. "$DEFAULT_FILE"
fi
: ${ARCH:="x86_64"}
: ${VARIANTS_DIR:="@sysconfdir@/ganeti/snf-image/variants"}
: ${IMAGE_DIR:="@localstatedir@/lib/snf-image"}
: ${HELPER_DIR:="@HELPER_DIR@"}
......
......@@ -29,7 +29,7 @@ if [ "$IMAGE_TYPE" = custom ]; then
image_size=\
$($CURL -sI "$IMAGE_NAME" | grep ^Content-Length: | cut -d" " -f2)
else
image_file="$IMAGE_DIR/$IMAGE_NAME-$ARCH.$IMAGE_TYPE"
image_file="$IMAGE_DIR/$IMAGE_NAME.$IMAGE_TYPE"
image_size="$(stat -L -c %s "$image_file")"
fi
......
......@@ -9,10 +9,6 @@
# IMAGE_DIR: directory location for disk images
# IMAGE_DIR="/var/lib/snf-image"
# ARCH: Define the ARCH of the image to use
# Use either x86 or x86_64
# ARCH="x86_64"
# IMAGE_DEBUG: turn on debugging output for the scripts
# IMAGE_DEBUG=0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment