For the timeout command, explicitly set seconds, don't rely on the default.

2 files changed, 3 insertions, 3 deletions

diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 7961ca4..1507ae9 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -551,9 +551,9 @@ APT.exe = function(c)
         -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well.
         -- --kill-after means "send KILL after TERM fails.
         if nil == c then
-            self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground 42.0s ' .. self.cmd
         else
-            self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground ' .. c .. ' ' .. self.cmd
         end
         return self
     end
diff --git a/update_apt-panopticon b/update_apt-panopticon
index 969cc8f..384ebdb 100755
--- a/update_apt-panopticon
+++ b/update_apt-panopticon
@@ -42,7 +42,7 @@ if [ "z" != "z${KEEPDAYS}" ] ; then
 fi
 
 rm ../results; ln -s apt-panopticon/results_old ../results
-flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
+flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0s --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
 if [ -f apt-panopticon.lock ] ; then
     echo "apt-panopticon timed out."
     ./laggers