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

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
index 373e00f..039c423 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
+++ b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
@@ -15,10 +15,10 @@ set -u
 
 bailout() {
   if [ "${1:-}" = "4" ] ; then
-    echo "Warning: freshclam returned with exit code 4." >&2
+    echo "Warning: update-pciids returned with exit code 4." >&2
 
     # be verbose in logs
-    echo "Warning: freshclam returned with exit code 4."
+    echo "Warning: update-pciids 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"
@@ -33,8 +33,8 @@ bailout() {
 
 [ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
 
-if ! [ -x $target/usr/bin/update-pciids ] ; then
-  echo "Warning: update-pciids not installed"
+if ! [ -x "${target}/usr/sbin/update-pciids" ] && ! [ -x "${target}/usr/bin/update-pciids" ] ; then
+  echo "Warning: update-pciids not installed (neither /usr/sbin/update-pciids nor /usr/bin/update-pciids exists"
   exit 0
 fi