diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-29 09:27:38 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-03 13:59:16 -0500 |
| commit | 0086036141f59d80bb2ff534fed59caabb19c8bc (patch) | |
| tree | 36006e283660f0093ad2ce69a2803a618dba2e1b /nixos/lib | |
| parent | 8422a14493e6bf87023dff54cc115646811ce233 (diff) | |
| download | nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar.gz nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar.bz2 nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar.lz nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar.xz nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.tar.zst nixlib-0086036141f59d80bb2ff534fed59caabb19c8bc.zip | |
Machine.pm: tweak to look for graphical target in waitForX
Current message may not be printed (nothing in systemd contains that string, it comes from elsewhere)
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 78598b3efb4b..7e269b43e70f 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -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; |