summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-04-02 11:54:16 +0100
committerRĂ©mi Verschelde <rverschelde@gmail.com>2017-04-04 20:05:25 +0200
commit519c83885a19195f1f580dbcc154b6596f76ff5c (patch)
treed6053858dd1db95da0e159ae23c9164e3d5f6cf1
parent8c1b77dc5934c4ad1bf9aa8ed11758eef7290bc7 (diff)
downloaddrakx-519c83885a19195f1f580dbcc154b6596f76ff5c.tar
drakx-519c83885a19195f1f580dbcc154b6596f76ff5c.tar.gz
drakx-519c83885a19195f1f580dbcc154b6596f76ff5c.tar.bz2
drakx-519c83885a19195f1f580dbcc154b6596f76ff5c.tar.xz
drakx-519c83885a19195f1f580dbcc154b6596f76ff5c.zip
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.
-rw-r--r--perl-install/do_pkgs.pm2
1 files changed, 1 insertions, 1 deletions
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') {