diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-13 11:07:29 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-13 15:19:18 +0200 |
| commit | 851454ef7de30c75818c19920bd80bda6df2242f (patch) | |
| tree | 412ee136218eb5e2026601087bc2c540223d196d | |
| parent | 7d33057cdbd833884f36ad395fb910ad532478b9 (diff) | |
| download | drakx-851454ef7de30c75818c19920bd80bda6df2242f.tar drakx-851454ef7de30c75818c19920bd80bda6df2242f.tar.gz drakx-851454ef7de30c75818c19920bd80bda6df2242f.tar.bz2 drakx-851454ef7de30c75818c19920bd80bda6df2242f.tar.xz drakx-851454ef7de30c75818c19920bd80bda6df2242f.zip | |
do not run monitor-edid with drakx-in-chroot
rationale: it can timeouting
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
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: |