aboutsummaryrefslogtreecommitdiffstats
path: root/monitor-probe-using-X
diff options
context:
space:
mode:
Diffstat (limited to 'monitor-probe-using-X')
-rwxr-xr-xmonitor-probe-using-X6
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;