diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-08-11 21:17:04 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-08-11 21:42:45 +0100 |
| commit | 687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8 (patch) | |
| tree | d06d39ff130c49bf0abdd4eecbb13772e7c965f9 | |
| parent | 8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18 (diff) | |
| download | drakx-687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8.tar drakx-687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8.tar.gz drakx-687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8.tar.bz2 drakx-687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8.tar.xz drakx-687c0a03a82ba48d4a8db91ee992a2e5e6d02ce8.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>)
(cherry picked from commit 1bd5906918f44cd0fa4021c9cd34d0d6160203dd)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 460ea2a45..4ca4c3418 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) Version 17.88.2 - 28 May 2018 diff --git a/perl-install/any.pm b/perl-install/any.pm index a82fce94a..5e9bd1ed5 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 1c1108423..cbbfed7df 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.88.2 - 28 May 2018 |