GRMLBASE/91-update-pciids: test for new update-pciids location in /usr/sbin

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 91-update-pciids

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