From 1e46047066e57bf886d97624ebd397198da815a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Mar 2019 16:07:43 +0100 Subject: [PATCH 1/2] tests: install "head" in the image For #11915. --- test/test-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-functions b/test/test-functions index d8a3502a4a..2790b8a6be 100644 --- a/test/test-functions +++ b/test/test-functions @@ -24,8 +24,8 @@ fi PATH_TO_INIT=$ROOTLIBDIR/systemd -BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe sed cmp tee rm true false chmod chown ln xargs" -DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname find" +BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo head tail cat mount umount cryptsetup date dmsetup modprobe sed cmp tee rm true false chmod chown ln xargs" +DEBUGTOOLS="df free ls stty ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname find" STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))" STATEFILE="$STATEDIR/.testdir" From 98b0439f086323a441f00227b88513da86bfd1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Mar 2019 16:07:47 +0100 Subject: [PATCH 2/2] tests: install /usr/bin/dbus-broker when using dbus-broker We'd install the service file, and then dbus-broker-launcher because it is mentioned in ExecStart=, but not the main executable, so nothing would work. Let's just install dbus-broker executables if found. They are small, so this doesn't matter much, and is much easier than figuring the exact conditions under which dbus-broker will be used instead of dbus-daemon. --- test/test-functions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/test-functions b/test/test-functions index 2790b8a6be..c2a12c5615 100644 --- a/test/test-functions +++ b/test/test-functions @@ -672,6 +672,9 @@ install_dbus() { else inst $ROOTLIBDIR/system/dbus.service fi + # Newer Fedora versions use dbus-broker by default. Let's install it is available. + [ -f /usr/bin/dbus-broker ] && inst /usr/bin/dbus-broker + [ -f /usr/bin/dbus-broker-launch ] && inst /usr/bin/dbus-broker-launch find \ /etc/dbus-1 /usr/share/dbus-1 -xtype f \