summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-10-28 22:44:35 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-10-29 21:58:02 +0000
commit3b588ebb600704b6f86c25954eb47221aac8af2a (patch)
treeaa2d2d21aad5ca61e6dfd1429b169eefe2120ea8 /perl-install
parent6b0bd8855ac16e789ffee642bee85ba9d4fb69d7 (diff)
downloaddrakx-3b588ebb600704b6f86c25954eb47221aac8af2a.tar
drakx-3b588ebb600704b6f86c25954eb47221aac8af2a.tar.gz
drakx-3b588ebb600704b6f86c25954eb47221aac8af2a.tar.bz2
drakx-3b588ebb600704b6f86c25954eb47221aac8af2a.tar.xz
drakx-3b588ebb600704b6f86c25954eb47221aac8af2a.zip
drakx-in-chroot: allow monitor-edid to be suppressed in package scriptlets.
mageia-theme runs monitor-edid in its post-install scriptlet, but this can hang indefinitely when run in a nested X session. So add a LOCAL_INSTALL environment variable to flag this case.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/steps.pm1
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e13f845e3..1c715fecc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- drakx-in-chroot:
+ o allow monitor-edid to be suppressed in post-install scriptlets
+
Version 18.3 - 15 Oct 2018
- drakboot: add support for the rEFInd boot manager (mga#15153)
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 7d3a5a67f..91e90e042 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -436,6 +436,7 @@ sub installPackages {
my $time = time();
{
local $ENV{DURING_INSTALL} = 1;
+ local $ENV{LOCAL_INSTALL} = 1 if $::local_install;
local $ENV{TMPDIR} = '/tmp';
local $ENV{TMP} = '/tmp';
local $ENV{HOME};