summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-06 12:58:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-06 12:58:54 +0000
commit47c85d99043cca6b4e972f297a685d67c1db7cfc (patch)
tree9edb0f78bb0ef3d5ca2f47768391d959fc55d82e
parentcf0c65a557e6c0a296663fbe583db280cb4c66dd (diff)
downloaddrakx-47c85d99043cca6b4e972f297a685d67c1db7cfc.tar
drakx-47c85d99043cca6b4e972f297a685d67c1db7cfc.tar.gz
drakx-47c85d99043cca6b4e972f297a685d67c1db7cfc.tar.bz2
drakx-47c85d99043cca6b4e972f297a685d67c1db7cfc.tar.xz
drakx-47c85d99043cca6b4e972f297a685d67c1db7cfc.zip
(ddcxinfos): use the new run_program::raw with a 20s timeout to workaround ddcxinfos going wild using 100% system CPU
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2420e6979..39f68738c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1034,7 +1034,8 @@ You can use userdrake to add a user in this group.")
sub ddcxinfos {
return if $::noauto;
- my @l = `$ENV{LD_LOADER} ddcxinfos`;
+ my @l;
+ run_program::raw({ timeout => 20 }, 'ddcxinfos', '>', \@l);
if ($::isInstall && -e "/tmp/ddcxinfos") {
my @l_old = cat_("/tmp/ddcxinfos");
if (@l < @l_old) {