From 3b588ebb600704b6f86c25954eb47221aac8af2a Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 28 Oct 2018 22:44:35 +0000
Subject: 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.
---
 perl-install/install/NEWS     | 3 +++
 perl-install/install/steps.pm | 1 +
 2 files changed, 4 insertions(+)

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};
-- 
cgit v1.2.1