diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2021-01-25 21:16:33 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2021-01-25 21:16:33 +0000 |
| commit | 959d3710c4effaae2804fa9615d7b5ca60f52280 (patch) | |
| tree | 7470848ecae9e3391224396ae66eb5e981046e55 | |
| parent | 41627b4145e8de08e28e07a4e5840248abd54f3e (diff) | |
| download | drakx-959d3710c4effaae2804fa9615d7b5ca60f52280.tar drakx-959d3710c4effaae2804fa9615d7b5ca60f52280.tar.gz drakx-959d3710c4effaae2804fa9615d7b5ca60f52280.tar.bz2 drakx-959d3710c4effaae2804fa9615d7b5ca60f52280.tar.xz drakx-959d3710c4effaae2804fa9615d7b5ca60f52280.zip | |
When running monitor-edid, don't use --try-in-console...
as it can cause a GNOME session to die (mga#28124)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 969e1c75e..b7a0668b5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- when running monitor-edid, don't use --try-in-console as + it can cause a GNOME session to die (mga#28124) - prefer using UUID for mmcblk and nvme devices (mga#28111) - service_harddrake: o support switching between free and proprietary drivers when diff --git a/perl-install/any.pm b/perl-install/any.pm index f2bb1c6d1..09033d55f 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1608,9 +1608,11 @@ sub monitor_full_edid() { { # prevent warnings in install's logs: local $ENV{LC_ALL} = 'C'; + # don't use --try-in-console as it can cause a GNOME session to die (mga#28124) + # with most DMs the DE is running in vt1, so it does nothing anyway run_program::raw({ timeout => 20 }, 'monitor-edid', '>', \$edid, '2>', \$vbe, - '-v', '--perl', if_($::isStandalone, '--try-in-console')); + '-v', '--perl'); } if ($::isInstall) { foreach (['edid', \$edid], ['vbe', \$vbe]) { |