Attachment 9176 Details for Bug 20620 – Patch to make do_pkgs_standalone::remove() use a chroot in a Live install

Patch to make do_pkgs_standalone::remove() use a chroot in a Live install

0003-Fix-do_pkgs_standalone-remove-for-Live-install.patch (text/plain), 1.06 KB, created by Martin Whitaker on 2017-04-02 22:33:49 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-04-02 22:33:49 CEST

Size: 1.06 KB

patch

obsolete

>From b86afa623a01265d923b271850a0d3b972a86469 Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Sun, 2 Apr 2017 12:19:44 +0100
>Subject: [PATCH 3/4] Fix do_pkgs_standalone::remove() for Live install.
>
>When running a Live install, we generally need to chroot to the
>install root when removing packages.
>
>This was causing os-prober to be removed from the Live system
>instead of from the installed system when the "Probe foreign OS"
>option was unchecked.
>
>diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
>index 4de82a0..e4b9b01 100644
>--- a/perl-install/do_pkgs.pm
>+++ b/perl-install/do_pkgs.pm
>@@ -388,7 +388,8 @@ sub remove {
>     my $_wait = $do->in && $do->in->wait_message(N("Please wait"), N("Removing packages..."));
>     $do->in->suspend if $do->in;
>     log::explanations("removing packages @l");
>-    my $ret = system('rpm', '-e', @l) == 0;
>+    my @wrapper = $::isLiveInstall && $::prefix ? ('chroot', $::prefix) : ();
>+    my $ret = system(@wrapper, 'rpm', '-e', @l) == 0;
>     $do->in->resume if $do->in;
>     $ret;
> }
>-- 
>2.10.2
>

From b86afa623a01265d923b271850a0d3b972a86469 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 2 Apr 2017 12:19:44 +0100
Subject: [PATCH 3/4] Fix do_pkgs_standalone::remove() for Live install.

When running a Live install, we generally need to chroot to the
install root when removing packages.

This was causing os-prober to be removed from the Live system
instead of from the installed system when the "Probe foreign OS"
option was unchecked.

diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index 4de82a0..e4b9b01 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -388,7 +388,8 @@ sub remove {
     my $_wait = $do->in && $do->in->wait_message(N("Please wait"), N("Removing packages..."));
     $do->in->suspend if $do->in;
     log::explanations("removing packages @l");
-    my $ret = system('rpm', '-e', @l) == 0;
+    my @wrapper = $::isLiveInstall && $::prefix ? ('chroot', $::prefix) : ();
+    my $ret = system(@wrapper, 'rpm', '-e', @l) == 0;
     $do->in->resume if $do->in;
     $ret;
 }
-- 
2.10.2

Actions: View

Attachments on bug 20620: 9174 | 9175 | 9176 | 9177 | 9182