summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-30 17:07:41 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-12-30 17:07:41 +0000
commitc41a61a5b85f93afbff07b989703b8fff66b2bb0 (patch)
treee5eed31291b8c65ce10fb7a175a1912a2966520a
parent069c9c4864c08780b49b7d4514aa7b849680b4f8 (diff)
downloaddrakx-c41a61a5b85f93afbff07b989703b8fff66b2bb0.tar
drakx-c41a61a5b85f93afbff07b989703b8fff66b2bb0.tar.gz
drakx-c41a61a5b85f93afbff07b989703b8fff66b2bb0.tar.bz2
drakx-c41a61a5b85f93afbff07b989703b8fff66b2bb0.tar.xz
drakx-c41a61a5b85f93afbff07b989703b8fff66b2bb0.zip
Disable timeout when installing updates (mga#27981)
The default 10 minute timeout is not enough when there are many updates. If the user has a slow internet connection it could take much longer. gurpmi should timeout itself if individual transactions hang.
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5b5bedbfe..0dcad7bd3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- disable timeout when installing updates (mga#27981)
+ o this can take a long time when there are many updates
+
Version 18.38 - 29 December 2020
- bootloader:
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 52b8b786d..a6f21b2d3 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -787,7 +787,7 @@ Do you want to install the updates?")),
my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi2'), 'urpmi' or return;
my $log_file = '/root/drakx/updates.log';
- run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');
+ run_program::raw({ root => $::prefix, timeout => 'never' }, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');
install::pkgs::clean_rpmdb_shared_regions();