Skip to content

Commit

Permalink
GRMLBASE/91-update-pciids: also ignore exit code 1
Browse files Browse the repository at this point in the history
If the grml_chroot uses /etc/resolv.conf with a symlink pointing to
/run/resolvconf/resolv.conf which might not exist, executing
update-pciids fails.

In the past, wget used to fail with exit code 4 (`Network failure`
according to wget(1)). Nowadays we seem to get exit code 1 (`Generic
error code`) instead. It behaves as such even if curl is present and
gets prefered over wget.

So let's also catch this error condition, to not fail a build because of
that, but instead warn about it.
  • Loading branch information
mika committed Sep 6, 2023
1 parent f0c9fee commit cb68d92
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ fi
set -u

bailout() {
if [ "${1:-}" = "4" ] ; then
echo "Warning: update-pciids returned with exit code 4." >&2
if [ "${1:-}" = "4" ] || [ "${1:-}" = "1" ] ; then
echo "Warning: update-pciids returned with exit code ${1:-}." >&2

# be verbose in logs
echo "Warning: update-pciids returned with exit code 4."
echo "Warning: update-pciids returned with exit code ${1:-}."
echo "-> This indicates that networking inside the chroot did not work"
echo " while GRMLBASE/91-update-pciids was running."
echo " To address this issue you can either configure /etc/resolv.conf"
Expand Down

0 comments on commit cb68d92

Please sign in to comment.