X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F91-update-pciids;fp=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F91-update-pciids;h=373e00fb8257f33956aa5b069d48c7298aeaa105;hb=11ac4be9eb01477570caae37e5f089a2bb736a39;hp=ecb5180ccb5cfc6a86f92024ae965be40093174b;hpb=4a69794ace57fce6df38354f1b9f73ff0bc5804b;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
index ecb5180..373e00f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
+++ b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
@@ -12,7 +12,24 @@ if ifclass NO_ONLINE ; then
 fi
 
 set -u
-set -e
+
+bailout() {
+  if [ "${1:-}" = "4" ] ; then
+    echo "Warning: freshclam returned with exit code 4." >&2
+
+    # be verbose in logs
+    echo "Warning: freshclam returned with exit code 4."
+    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"
+    echo "   accordingly or just run dnsmasq on your host."
+
+    exit 0
+  fi
+
+  exit "${1:-0}"
+}
+
 
 [ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
 
@@ -24,8 +41,10 @@ fi
 echo "Updating PCI-IDs"
 if [ -n "$TIMEOUT" ] ; then
    $ROOTCMD timeout $TIMEOUT update-pciids
+   bailout $?
 else
    $ROOTCMD update-pciids
+   bailout $?
 fi
 
 ## END OF FILE #################################################################