mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

run: Actually use timeout --foreground option (RHBZ#1025269).

Browse Source 
The following commit managed to not actually add the --foreground
option to the timeout command, just test for it.  Add it this time.

  commit 6814888774
  Author: Richard W.M. Jones <rjones@redhat.com>
  Date:   Thu Dec 19 08:21:53 2013 +0000

    run: Use timeout --foreground option.

    If timeout doesn't have this option (RHEL 6) don't use timeout at all.

    Attempt to fix RHBZ#1025269.
(cherry picked from commit e3f72805d1)
This commit is contained in:
Richard W.M. Jones
2014-01-27 21:58:42 +00:00
committed by Pino Toscano
parent 8a27be0451
commit 900b75cd1e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
run.in
View File

@@ -190,7 +190,7 @@ if timeout --help >/dev/null 2>&1; then
if timeout --foreground 2 sleep 0 >/dev/null 2>&1; then
# Does this version of timeout have the -k option? (Not on RHEL 6)
if timeout -k 10s 10s true >/dev/null 2>&1; then
timeout="timeout -k $timeout_kill $timeout_period"
timeout="timeout --foreground -k $timeout_kill $timeout_period"
fi
fi
fi