projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
92-update-freshclam: do not error out on exit code 124 by freshclam.
[grml-live-grml.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
..
ecb5180
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
@@
-17,16
+17,15
@@
set -e
[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
if ! [ -x $target/usr/bin/update-pciids ] ; then
[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
if ! [ -x $target/usr/bin/update-pciids ] ; then
- echo "Warning: update-pciids/update-usbids not installed"
+ echo "Warning: update-pciids not installed"
+ exit 0
+fi
+
+echo "Updating PCI-IDs"
+if [ -n "$TIMEOUT" ] ; then
+ $ROOTCMD timeout $TIMEOUT update-pciids
else
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
fi
## END OF FILE #################################################################
fi
## END OF FILE #################################################################