scripts: assume timeout is always available

Debian buster has timeout in coreutils, which is Essential: yes.
grml · Nov 26, 2024 · 14d0405 · 14d0405
1 parent 02129af
commit 14d0405
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids b/etc/grml/fai/config/scripts/GRMLBASE/91-update-pciids
@@ -31,21 +31,15 @@ bailout() {
 }
 
 
-[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
 
 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
-   $ROOTCMD update-pciids
-   bailout $?
-fi
+$ROOTCMD timeout 10 update-pciids
+bailout $?
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam b/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam
@@ -37,21 +37,14 @@ bailout() {
   exit "${1:-0}"
 }
 
-[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
-
 if ! [ -x $target/usr/bin/freshclam ] ; then
   echo "freshclam not installed"
   exit 0
 fi
 
 echo "Updating clamav database via running freshclam"
-if [ -n "$TIMEOUT" ] ; then
-   $ROOTCMD timeout $TIMEOUT /usr/bin/freshclam
-   bailout $?
-else
-   $ROOTCMD /usr/bin/freshclam
-   bailout $?
-fi
+$ROOTCMD timeout 10 /usr/bin/freshclam
+bailout $?
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/94-update-smart-drivedb b/etc/grml/fai/config/scripts/GRMLBASE/94-update-smart-drivedb
@@ -14,22 +14,14 @@ fi
 set -u
 set -e
 
-[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
-
 if ! [ -x ${target}/usr/sbin/update-smart-drivedb ] ; then
   echo "NOTE: update-smart-drivedb not present (possibly smartmontools >=6.4+svn4214-1 present)"
   exit 0
 fi
 
 echo "Updating smartmontool drivedb"
-if [ -n "$TIMEOUT" ] ; then
-   if ! $ROOTCMD timeout $TIMEOUT update-smart-drivedb ; then
-     echo "Warning: failed to update smartmontool drivedb, ignoring failure"
-   fi
-else
-   if ! $ROOTCMD update-smart-drivedb ; then
-     echo "Warning: failed to update smartmontool drivedb, ignoring failure"
-   fi
+if ! $ROOTCMD timeout 10 update-smart-drivedb ; then
+  echo "Warning: failed to update smartmontool drivedb, ignoring failure"
 fi
 
 ## END OF FILE #################################################################