From 3ddb9371241898bd0c1f203a8bec078e07d5ebd6 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Nov 2017 14:09:28 +0100 Subject: [PATCH] GRMLBASE/91-update-pciids: test for new update-pciids location in /usr/sbin Since pciutils v1:3.2.0-1 the update-pciids binary lives in /usr/sbin and no longer in /usr/bin. --- etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids index 7ba4148..039c423 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids +++ b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids @@ -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 -- 2.1.4