From 851454ef7de30c75818c19920bd80bda6df2242f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 13 Sep 2018 11:07:29 +0200
Subject: do not run monitor-edid with drakx-in-chroot

rationale: it can timeouting
---
 perl-install/any.pm       | 2 +-
 perl-install/install/NEWS | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1512f48c1..36d201be6 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1494,7 +1494,7 @@ You can use userdrake to add a user to this group.")
 }
 
 sub monitor_full_edid() {
-    return if $::noauto;
+    return if $::noauto || $::local_install;
 
     my ($vbe, $edid);
     {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a04ca9be5..759d15cd0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- drakx-in-chroot:
+  o do not run monitor-edid with drakx-in-chroot (timeout)
+
 Version 18.0 - 25 August 2018
 
 - mdadm raid:
-- 
cgit v1.2.1