public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38174 from dtzWill/fix/nixos-machine-pm-tweak-waitForX

Browse Source 
Machine.pm: tweak to look for graphical target in waitForX
This commit is contained in:
Will Dietz
2018-04-03 21:08:19 -05:00
committed by GitHub
parent e4e0cd66fe 0086036141
commit 374d7cfb8e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/test-driver/Machine.pm
View File

@@ -612,7 +612,7 @@ sub waitForX {
my ($self, $regexp) = @_;
$self->nest("waiting for the X11 server", sub {
retry sub {
my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'");
return 0 if $status != 0;
($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
return 1 if $status == 0;