summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-03 18:55:09 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-03 18:55:09 +0000
commit3aad8558fef212ca0b6157b9be4c985728e70288 (patch)
tree3968caa0d7a177bcaccde279ed6e223f3bcdc764
parentc286ea3e6622fe65dacc02e04bd9d4b42afc8ac4 (diff)
downloaddrakx-3aad8558fef212ca0b6157b9be4c985728e70288.tar
drakx-3aad8558fef212ca0b6157b9be4c985728e70288.tar.gz
drakx-3aad8558fef212ca0b6157b9be4c985728e70288.tar.bz2
drakx-3aad8558fef212ca0b6157b9be4c985728e70288.tar.xz
drakx-3aad8558fef212ca0b6157b9be4c985728e70288.zip
reduce default timeout from 10 to 2mn (mga#4772)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/service_harddrake4
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d628f0f5a..e0b199196 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- harddrake service:
o cpufreq performance governor is no longer a module
+ o reduce default timeout from 10 to 2mn (mga#4772)
Version 14.1 - 23 March 2012
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index e575f6098..7c8be09fd 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -27,6 +27,10 @@ use Xconfig::card;
use Xconfig::various;
use modules;
use Storable qw(store retrieve);
+use run_program;
+
+# timeout runaway processes after 2mn:
+run_program::set_default_timeout(2*60);
my $force = member('--force', @ARGV);