From 19f247d5f637c2713c6cfecd4229c95a2cda7ff9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 13 May 2014 11:44:11 +0200 Subject: [PATCH] MT#6807 Adjust getty check for usage with systemd Check for getty process without path information and arguments, because on systemd powered systems we have: | /sbin/agetty tty1 38400 while sysvinit powered systemd run: | /sbin/getty 38400 tty1 | /sbin/getty 38400 tty2 | /sbin/getty 38400 tty3 | /sbin/getty 38400 tty4 | /sbin/getty 38400 tty5 | /sbin/getty 38400 tty6 As soon as one "getty" process is available that should be fine enough for us, no matter whether it's /sbin/agetty or /sbin/getty. (Of course it would be even better if we'd have regex support in the tests, but that's not available in upstream code...) --- ce/test-server.yaml | 2 +- pro/test-server.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ce/test-server.yaml b/ce/test-server.yaml index bf0c163..c54a988 100644 --- a/ce/test-server.yaml +++ b/ce/test-server.yaml @@ -9,7 +9,7 @@ running-processes: - collectd -C /etc/collectd/collectd.conf -f - nginx - rate-o-mat - - /sbin/getty 38400 tty + - getty - udevd - /usr/bin/logger -p daemon.info -t oss - lua5.1 /usr/bin/prosody diff --git a/pro/test-server.yaml b/pro/test-server.yaml index d77c9f4..12c7018 100644 --- a/pro/test-server.yaml +++ b/pro/test-server.yaml @@ -21,7 +21,7 @@ running-processes: - "ha_logd: read process" - /usr/sbin/hb_watchdog - rate-o-mat - - /sbin/getty 38400 tty + - getty - udevd - /usr/bin/logger -p daemon.info -t oss - lua5.1 /usr/bin/prosody