Give up and use systemctl to start haveged if running under systemd; this shouldn't be necessary, but I can't seem to get things working in the Ubuntu autopkgtest environment otherwise.

2 files changed, 22 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index f2f442576..4184a8508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 openssh (1:7.5p1-10) UNRELEASED; urgency=medium
 
   * Tell haveged to create the pid file we expect.
+  * Give up and use systemctl to start haveged if running under systemd;
+    this shouldn't be necessary, but I can't seem to get things working in
+    the Ubuntu autopkgtest environment otherwise.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 01 Sep 2017 02:41:04 +0100
 
diff --git a/debian/tests/regress b/debian/tests/regress
index c6e3a15db..e89e1940a 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -3,13 +3,20 @@ set -ex
 
 if [ "$(id -un)" != openssh-tests ]; then
         TMP="$ADTTMP/user"
+        STARTED_HAVEGED=false
 
         cleanup () {
-                if [ -e "$TMP/haveged.pid" ]; then
-                        start-stop-daemon --stop --quiet \
-                                --retry=TERM/30/KILL/5 \
-                                --pidfile "$TMP/haveged.pid" \
-                                --name haveged
+                if $STARTED_HAVEGED; then
+                        if [ -d /run/systemd/system ] && \
+                           which systemctl >/dev/null 2>&1; then
+                                systemctl disable haveged || true
+                                systemctl stop haveged || true
+                        else
+                                start-stop-daemon --stop --quiet \
+                                        --retry=TERM/30/KILL/5 \
+                                        --pidfile "$TMP/haveged.pid" \
+                                        --name haveged
+                        fi
                 fi
                 rm -rf "$TMP"
                 rm -f /etc/sudoers.d/openssh-tests
@@ -29,13 +36,16 @@ EOF
         chown -R openssh-tests:openssh-tests "$TMP"
 
         # If we're running in a container, haveged may not have started
-        # automatically.  Do this by hand rather than via systemctl or
-        # similar, since autopkgtests shouldn't depend on a particular init
-        # system.
-        if ! pidof haveged >/dev/null; then
+        # automatically.
+        if [ -d /run/systemd/system ] && which systemctl >/dev/null 2>&1; then
+                systemctl enable haveged || true
+                systemctl start haveged || true
+                STARTED_HAVEGED=:
+        elif ! pidof haveged >/dev/null; then
                 start-stop-daemon --start --quiet \
                         --pidfile "$TMP/haveged.pid" \
                         --exec /usr/sbin/haveged -- -p "$TMP/haveged.pid"
+                STARTED_HAVEGED=:
         fi
 
         sudo -u openssh-tests env TMP="$TMP" "$0" "$@"