From ffa52f4c674477795a756bbe5983b5a20929ce94 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 14 Jun 2019 16:03:49 +0200 Subject: [PATCH 1/2] tests: Reflect new location of D-Bus service files Related to the following change: commit f9d9b4e89915fdc87f8d9b56269def24f709b2da Author: Michael Biebl Date: Tue Nov 27 00:48:15 2018 +0100 Move D-Bus policy file to /usr/share/dbus-1/system.d/ To better support stateless systems with an empty /etc, the old location in /etc/dbus-1/system.d/ should only be used for local admin changes. Package provided D-Bus policy files are supposed to be installed in /usr/share/dbus-1/system.d/. This is supported since dbus 1.9.18. https://lists.freedesktop.org/archives/dbus/2015-July/016746.html --- README.md | 2 +- src/tests/dbus-tests/run_tests.py | 2 +- src/tests/install-udisks/runtest.sh | 2 +- src/tests/integration-test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b4fa385c..cf2207cf 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Please report bugs via the GitHub's issues tracker at sudo cp data/*.policy /usr/share/polkit-1/actions/ sudo cp modules/*/data/*.policy /usr/share/polkit-1/actions/ - sudo cp data/org.freedesktop.UDisks2.conf /etc/dbus-1/system.d/ + sudo cp data/org.freedesktop.UDisks2.conf /usr/share/dbus-1/system.d/ sudo cp data/80-udisks2.rules /usr/lib/udev/rules.d/ ``` diff --git a/src/tests/dbus-tests/run_tests.py b/src/tests/dbus-tests/run_tests.py index e730346a..3dc3c631 100755 --- a/src/tests/dbus-tests/run_tests.py +++ b/src/tests/dbus-tests/run_tests.py @@ -96,7 +96,7 @@ def install_config_files(projdir, tmpdir): # dbus config files copied.extend(_copy_files((os.path.join(projdir, 'data/org.freedesktop.UDisks2.conf'),), - '/etc/dbus-1/system.d/', tmpdir)) + '/usr/share/dbus-1/system.d/', tmpdir)) # polkit policies policies = glob.glob(projdir + '/data/*.policy') + glob.glob(projdir + '/modules/*/data/*.policy') diff --git a/src/tests/integration-test b/src/tests/integration-test index 19087bbc..2bc78a2b 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test @@ -1866,7 +1866,7 @@ def install_config_files(projdir, tmpdir): # dbus config files copied.extend(_copy_files((os.path.join(projdir, 'data/org.freedesktop.UDisks2.conf'),), - '/etc/dbus-1/system.d/', tmpdir)) + '/usr/share/dbus-1/system.d/', tmpdir)) # polkit policies policies = glob(projdir + '/data/*.policy') + glob(projdir + '/modules/*/data/*.policy') -- 2.21.0