From 1b8b36a9ec8242d2c6fd628d4ca25d99efb9e2f3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Nov 2017 14:12:06 +0100 Subject: [PATCH] GRMLBASE/93-update-usbids: test for new update-usbids location in /usr/sbin "Recent" versions of usbutils ship the update-usbids binary in /usr/sbin and no longer in /usr/bin. --- etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids b/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids index 6fc4a73..d2972d3 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids +++ b/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids @@ -16,8 +16,8 @@ set -e [ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT="" -if ! [ -x $target/usr/bin/update-usbids ] ; then - echo "Warning: update-usbids not installed" +if ! [ -x "${target}/usr/sbin/update-usbids" ] && ! [ -x "${target}/usr/bin/update-usbids" ] ; then + echo "Warning: update-usbids not installed (neither /usr/sbin/update-usbids nor /usr/bin/update-usbids exists)" exit 0 fi -- 2.1.4