From 519c83885a19195f1f580dbcc154b6596f76ff5c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 2 Apr 2017 11:54:16 +0100
Subject: Clean up detection of Live install root in
 do_pkgs_standalone::install().

Now we have $::isLiveInstall, we can use it. Also use $::prefix
instead of hardcoding the path.
---
 perl-install/do_pkgs.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install/do_pkgs.pm')

diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index 44f2e3ada..4c40d460e 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -333,7 +333,7 @@ sub install {
 	return 1;
     }
 
-    my @wrapper = is_mgalive() && -e '/mnt/install' ? qw(chroot /mnt/install) : ();
+    my @wrapper = $::isLiveInstall && $::prefix ? ('chroot', $::prefix) : ();
     my @options = ('--allow-medium-change', '--auto', '--no-verify-rpm', '--expect-install', @l);
     my $ret;
     if (check_for_xserver() && -x '/usr/bin/gurpmi') {
-- 
cgit v1.2.1