summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2021-04-02 16:57:33 +0100
committerLuca Boccassi <bluca@debian.org>2021-04-02 16:57:33 +0100
commit93ab49f927a800935daf7883f0defdc707696328 (patch)
tree0d187497eae13c82dcd4835c2850aa8bd9db8d8f
parent57f2cc1cd6de1c90a7034be74cb4155f7986f825 (diff)
downloadvyos-live-build-93ab49f927a800935daf7883f0defdc707696328.tar.gz
vyos-live-build-93ab49f927a800935daf7883f0defdc707696328.zip
Firmware download: skip architecture if not found
Contents-all.gz does not seem to exist on Buster, so don't fail if wget doesn't find the file. Closes: #986278
-rwxr-xr-xfunctions/firmwarelists.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/functions/firmwarelists.sh b/functions/firmwarelists.sh
index bf5c177ca..c1b7a598b 100755
--- a/functions/firmwarelists.sh
+++ b/functions/firmwarelists.sh
@@ -40,6 +40,10 @@ Firmware_List_From_Contents () {
# If not cached, download
if [ ! -e "${CONTENTS_FILE}" ]
then
+ # Contents-all.gz does not exist in Buster and other older versions
+ if ! wget --quiet --spider ${WGET_OPTIONS} "${CONTENTS_URL}"; then
+ continue
+ fi
wget ${WGET_OPTIONS} "${CONTENTS_URL}" -O "${CONTENTS_FILE}"
fi