diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-17 17:07:03 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-17 17:07:03 +0200 |
| commit | bfda72c2f95b39c2dfa95680dd2b186ba01420d8 (patch) | |
| tree | 3608039c62bd30a8c87e4d8d821392cc0c5b8c07 /nixos/lib | |
| parent | 560a1103adf3834698c73cc98a5b70ec6aa3bbcc (diff) | |
| download | nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar.gz nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar.bz2 nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar.lz nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar.xz nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.tar.zst nixlib-bfda72c2f95b39c2dfa95680dd2b186ba01420d8.zip | |
Fix waitForX
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 6d3ffa173593..e2bd3393d872 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -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; |