summaryrefslogtreecommitdiffstats
path: root/test/TEST-15-DROPIN
diff options
context:
space:
mode:
authorChris Down <chris@chrisdown.name>2019-10-17 05:10:05 +0200
committerGitHub <noreply@github.com>2019-10-17 05:10:05 +0200
commit959daf9bfc6617169710ef226718be90ab9f9037 (patch)
tree5071572a5ed18705fe1b786d3ac2fa9edf49da6b /test/TEST-15-DROPIN
parentMerge pull request #13784 from keszybz/constify-unit-pointers (diff)
parentshared/dropin: support -.service.d/ top level drop-in for service units (diff)
downloadsystemd-959daf9bfc6617169710ef226718be90ab9f9037.tar.xz
systemd-959daf9bfc6617169710ef226718be90ab9f9037.zip
Merge pull request #13743 from anitazha/dropin_all_the_things
core: support top level drop-ins through -.service.d for service units
Diffstat (limited to 'test/TEST-15-DROPIN')
-rwxr-xr-xtest/TEST-15-DROPIN/test-dropin.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/test/TEST-15-DROPIN/test-dropin.sh b/test/TEST-15-DROPIN/test-dropin.sh
index 2cef5a3c5b..75c36df2b8 100755
--- a/test/TEST-15-DROPIN/test-dropin.sh
+++ b/test/TEST-15-DROPIN/test-dropin.sh
@@ -101,6 +101,19 @@ test_basic_dropins () {
check_ok b Wants c.service
systemctl stop a c
+ echo "*** test -.service.d/ top level drop-in"
+ create_services a b
+ check_ko a ExecCondition "/bin/echo a"
+ check_ko b ExecCondition "/bin/echo b"
+ mkdir -p /usr/lib/systemd/system/-.service.d
+ cat >/usr/lib/systemd/system/-.service.d/override.conf <<EOF
+[Service]
+ExecCondition=/bin/echo %n
+EOF
+ check_ok a ExecCondition "/bin/echo a"
+ check_ok b ExecCondition "/bin/echo b"
+ rm -rf /usr/lib/systemd/system/-.service.d
+
clear_services a b c
}