[Pkg-utopia-maintainers] Bug#962466: dbus: system-bus autopackage test fails when not run under systemd

[Mark Hindley]

Package: dbus
Version: 1.12.16-1
Severity: normal
Tags: patch

Simon,

dbus autopackage tests currently fail when run on a system without systemd.

 + systemctl daemon-reload
 /tmp/autopkgtest.Ad9GdF/build.UJj/src/debian/tests/system-bus: 127: systemctl: not found

The test attempts to detect whether systemd is available by testing for
/run/systemd. However, this path can exist on non-systemd systems. I believe the
correct path to test is /run/systemd/system.

A patch with the required changes is attached for your consideration.

Many thanks.

Mark

-- System Information:
Debian Release: 10.0
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-9-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
LSM: AppArmor: enabled

Versions of packages dbus depends on:
ii  adduser       3.118
ii  libapparmor1  2.13.2-10
ii  libaudit1     1:2.8.4-3
ii  libc6         2.28-10
ii  libcap-ng0    0.7.9-2
ii  libdbus-1-3   1.12.16-1+devuan2
ii  libexpat1     2.2.6-2+deb10u1
ii  libselinux1   2.8-1+b1

dbus recommends no packages.

Versions of packages dbus suggests:
ii  dbus-x11 [dbus-session-bus]  1.12.16-1+devuan2

Versions of packages dbus is related to:
ii  dbus-x11      1.12.16-1+devuan2
pn  systemd       <none>
pn  systemd-sysv  <none>

-- no debconf information
-------------- next part --------------
>From 949b271aa5ab0f4bec6afc9c8eed21fa668b059f Mon Sep 17 00:00:00 2001
From: Mark Hindley <mark at hindley.org.uk>
Date: Mon, 8 Jun 2020 11:58:58 +0100
Subject: [PATCH] Fix system-bus autopackage test detection of systemd as PID1

---
 debian/tests/system-bus | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/tests/system-bus b/debian/tests/system-bus
index 61ad077d..47398574 100755
--- a/debian/tests/system-bus
+++ b/debian/tests/system-bus
@@ -19,7 +19,7 @@ test /run/dbus/system_bus_socket -ef /var/run/dbus/system_bus_socket || failed=1
 getent passwd messagebus || failed=1
 getent group messagebus || failed=1
 
-if [ -d /run/systemd ]; then
+if [ -d /run/systemd/system ]; then
     journalctl -f &
     journalctl_pid="$!"
 fi
@@ -123,7 +123,7 @@ dbus-send --system --dest="org.debian.packages.dbus.TradActivation" \
     / org.freedesktop.DBus.Peer.Ping \
     || failed=1
 
-if [ -d /run/systemd ]; then
+if [ -d /run/systemd/system ]; then
     systemctl daemon-reload
 
     dbus-send --system --dest="org.debian.packages.dbus.SystemdActivation" \
-- 
2.20.1