projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66b3d05
)
GRMLBASE/91-update-pciids: test for new update-pciids location in /usr/sbin
author
Michael Prokop
<mika@grml.org>
Wed, 22 Nov 2017 13:09:28 +0000
(14:09 +0100)
committer
Michael Prokop
<mika@grml.org>
Wed, 22 Nov 2017 13:09:28 +0000
(14:09 +0100)
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
patch
|
blob
|
history
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
(executable)
--- 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