summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2018-08-11 21:17:04 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-08-11 21:26:22 +0100
commit1bd5906918f44cd0fa4021c9cd34d0d6160203dd (patch)
tree77ae3efeed0deed61a31c5f157d8bd9c49d786c7 /perl-install
parentf0fe28807a30317d43c78c323311790e4095a5b4 (diff)
downloaddrakx-1bd5906918f44cd0fa4021c9cd34d0d6160203dd.tar
drakx-1bd5906918f44cd0fa4021c9cd34d0d6160203dd.tar.gz
drakx-1bd5906918f44cd0fa4021c9cd34d0d6160203dd.tar.bz2
drakx-1bd5906918f44cd0fa4021c9cd34d0d6160203dd.tar.xz
drakx-1bd5906918f44cd0fa4021c9cd34d0d6160203dd.zip
installer: remove current media before adding online media (mga#19742)
thus preventing a failure when installing updates (due to udisks-daemon not running) if a package was available in the install media. Note that this will also cause the live system local repo to be removed when finish-install is run after installing the live system to disk. This is harmless - anything in the local repo should also be available in the online media - and indeed, leads to a cleaner system. (committed by Martin Whitaker <mageia@martin-whitaker.me.uk>)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm3
-rw-r--r--perl-install/install/NEWS1
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8f871177f..a11a07292 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- finish-install: remove current media before adding online media (mga#19742)
- drakboot: include the "Mageia" entry in the gub2 Default choices (mga#23393)
- recognize smartpqi driver (mga#23305)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 92af852bd..1512f48c1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1024,6 +1024,9 @@ sub urpmi_add_all_media {
log::l("no network connexion!");
return;
}
+ # First remove all media:
+ run_program::rooted($::prefix, 'urpmi.removemedia', '-a');
+ # Then add online media:
my $wait;
my @options = ('--distrib', '--mirrorlist', '$MIRRORLIST');
if ($binary eq 'urpmi.addmedia') {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3d39c7b0e..e002daa8b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- remove current media before adding online media for updates (mga#19742)
- bootloader: include the "Mageia" entry in the gub2 Default choices (mga#23393)
Version 17.99 - 9 August 2018