diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2009-10-18 16:53:57 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2009-10-18 16:53:57 +0000 |
| commit | c61e79a73477cc5f6660e7557c73f1ed786c5caf (patch) | |
| tree | 0b888ac71ce1a32fa506fea83c1d215370110a0f /monitor-probe-using-X | |
| parent | b27bbc4493133263509593abd26900b7bfe4b156 (diff) | |
| download | monitor-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)
Diffstat (limited to 'monitor-probe-using-X')
| -rwxr-xr-x | monitor-probe-using-X | 6 |
1 files changed, 5 insertions, 1 deletions
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; |