aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2009-10-18 16:53:57 +0000
committerAnssi Hannula <anssi@mandriva.org>2009-10-18 16:53:57 +0000
commitc61e79a73477cc5f6660e7557c73f1ed786c5caf (patch)
tree0b888ac71ce1a32fa506fea83c1d215370110a0f
parentb27bbc4493133263509593abd26900b7bfe4b156 (diff)
downloadmonitor-edid-c61e79a73477cc5f6660e7557c73f1ed786c5caf.tar
monitor-edid-c61e79a73477cc5f6660e7557c73f1ed786c5caf.tar.gz
monitor-edid-c61e79a73477cc5f6660e7557c73f1ed786c5caf.tar.bz2
monitor-edid-c61e79a73477cc5f6660e7557c73f1ed786c5caf.tar.xz
monitor-edid-c61e79a73477cc5f6660e7557c73f1ed786c5caf.zip
monitor-probe-using-X:
use -sharevts for X server when plymouth is active, as VT switching does not work at that point (fixes Mandriva bug #53736)
-rw-r--r--NEWS2
-rwxr-xr-xmonitor-probe-using-X6
2 files changed, 7 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a17bdeb..11200d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- monitor-probe-using-X:
o disable glx module to speed up X startup, especially if a proprietary
glx module is in use (fixes a timeout observed by Anssi Hannula)
+ o use -sharevts for X server when plymouth is active, as VT switching
+ does not work at that point (fixes Mandriva bug #53736)
Version 2.4 - 1 October 2009
diff --git a/monitor-probe-using-X b/monitor-probe-using-X
index 820114f..07ccd59 100755
--- a/monitor-probe-using-X
+++ b/monitor-probe-using-X
@@ -95,8 +95,12 @@ EndSection
EOF
my $prev_vt = $Driver eq 'i810' && chvt(1); #- otherwise it can kill existing X
+ #- use -sharevts to avoid X trying to switch VT while plymouth is active;
+ #- trying to switch VT would lock X up (the system would continue to run
+ #- fine, though, as it happens before any drivers are loaded)
+ my $sharevts = (-x "/bin/plymouth" && system("/bin/plymouth --ping") == 0) ? "-sharevts" : "";
alarm 10;
- my $ok = system("X :67 -ac -probeonly -logfile $tmp_log -config $tmp_conf") == 0;
+ my $ok = system("X :67 $sharevts -ac -probeonly -logfile $tmp_log -config $tmp_conf") == 0;
alarm 0;
chvt($prev_vt) if $prev_vt;