sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fail early when lates build information can not be fetched

Browse Source 
When the mirror returns a error, it was trying to interpret the error
message (e.g. <html><title>Internal server error..) as a download link.
By using -f on curl we get an empty reply and an exit code, which, as
we run in set -e mode, aborts.

Change-Id: Ibaa39aedb7db286f859c4b090114c6a233b150c7
This commit is contained in:
Dirk Mueller 2019-05-08 23:38:12 +02:00 committed by Ian Wienand
parent ed6dfd87e5
commit 421a0fa541
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/gentoo/root.d/10-gentoo-image
View File

@ -65,7 +65,7 @@ else
fi fi
DIB_CLOUD_SOURCE=${DIB_CLOUD_SOURCE:-"http://distfiles.gentoo.org/releases/amd64/autobuilds/latest-stage4-amd64-${SIGNED_SOURCE_SUFFIX}.txt"} DIB_CLOUD_SOURCE=${DIB_CLOUD_SOURCE:-"http://distfiles.gentoo.org/releases/amd64/autobuilds/latest-stage4-amd64-${SIGNED_SOURCE_SUFFIX}.txt"}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-"http://distfiles.gentoo.org/releases/amd64/autobuilds/$(curl ${DIB_CLOUD_SOURCE} -s | tail -n 1 | cut -d\ -f 1)"} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-"http://distfiles.gentoo.org/releases/amd64/autobuilds/$(curl ${DIB_CLOUD_SOURCE} -s -f | tail -n 1 | cut -d\ -f 1)"}
BASE_IMAGE_FILE_SUFFIX=${BASE_IMAGE_FILE_SUFFIX:-"$(basename ${BASE_IMAGE_FILE} | cut -d. -f 2,3)"} BASE_IMAGE_FILE_SUFFIX=${BASE_IMAGE_FILE_SUFFIX:-"$(basename ${BASE_IMAGE_FILE} | cut -d. -f 2,3)"}
SIGNATURE_FILE="${SIGNATURE_FILE:-${BASE_IMAGE_FILE}.DIGESTS.asc}" SIGNATURE_FILE="${SIGNATURE_FILE:-${BASE_IMAGE_FILE}.DIGESTS.asc}"
CACHED_FILE="${DIB_IMAGE_CACHE}/${FILENAME_BASE}.${BASE_IMAGE_FILE_SUFFIX}" CACHED_FILE="${DIB_IMAGE_CACHE}/${FILENAME_BASE}.${BASE_IMAGE_FILE_SUFFIX}"

2
diskimage_builder/elements/hpdsa/pre-install.d/06-hpdsa
View File

@ -11,4 +11,4 @@ echo 'deb https://downloads.linux.hp.com/SDR/repo/ubuntu-hpdsa' $DIB_RELEASE ' m
>> /etc/apt/sources.list.d/ubuntu-hpdsa.list >> /etc/apt/sources.list.d/ubuntu-hpdsa.list
# Add the key # Add the key
curl https://downloads.linux.hp.com/SDR/hpPublicKey2048_key1.pub | apt-key add - curl -f -s https://downloads.linux.hp.com/SDR/hpPublicKey2048_key1.pub | apt-key add -

4
diskimage_builder/elements/source-repositories/extra-data.d/98-source-repositories
View File

@ -201,7 +201,7 @@ function get_repos_for_element(){
tar -C $tmpdir -xzf $CACHE_PATH tar -C $tmpdir -xzf $CACHE_PATH
else else
echo "Fetching $REPONAME tarball from $REPOLOCATION" echo "Fetching $REPONAME tarball from $REPOLOCATION"
curl $REPOLOCATION | tar -C $tmpdir -xzf - curl -f $REPOLOCATION | tar -C $tmpdir -xzf -
fi fi
sudo mkdir -p $REPO_DEST sudo mkdir -p $REPO_DEST
@ -223,7 +223,7 @@ function get_repos_for_element(){
sudo cp $CACHE_PATH $REPO_DEST sudo cp $CACHE_PATH $REPO_DEST
else else
echo "Fetching $REPONAME file from $REPOLOCATION" echo "Fetching $REPONAME file from $REPOLOCATION"
sudo curl $REPOLOCATION -o $REPO_DEST sudo curl -f $REPOLOCATION -o $REPO_DEST
fi fi
;; ;;
*) *)