3
0
Fork 0
forked from mirrors/nixpkgs

Fix waitForX

This commit is contained in:
Eelco Dolstra 2014-04-17 17:07:03 +02:00
parent 560a1103ad
commit bfda72c2f9

View file

@ -495,7 +495,7 @@ sub waitForX {
my ($self, $regexp) = @_;
$self->nest("waiting for the X11 server", sub {
retry sub {
my ($status, $out) = $self->execute("journalctl -b -u systemd-logind | grep Linked");
my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
return 0 if $status != 0;
($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
return 1 if $status == 0;