67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 832ceb778409cac37c3b64294dc64312e86eedc6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Sun, 16 Oct 2022 21:52:43 +0200
|
|
Subject: [PATCH] TEST-15: add one more test for drop-in precedence
|
|
|
|
(cherry picked from commit c3fa408dcc03bb6dbd11f180540fb9e684893c39)
|
|
|
|
Related: #2156620
|
|
---
|
|
test/TEST-15-DROPIN/test-dropin.sh | 36 ++++++++++++++++++++++++++++++
|
|
1 file changed, 36 insertions(+)
|
|
|
|
diff --git a/test/TEST-15-DROPIN/test-dropin.sh b/test/TEST-15-DROPIN/test-dropin.sh
|
|
index 5f061d3629..f6b3844630 100755
|
|
--- a/test/TEST-15-DROPIN/test-dropin.sh
|
|
+++ b/test/TEST-15-DROPIN/test-dropin.sh
|
|
@@ -233,6 +233,41 @@ MemoryMax=1000000001
|
|
clear_units a-b-c.slice
|
|
}
|
|
|
|
+test_transient_service_dropins () {
|
|
+ echo "Testing dropins for a transient service..."
|
|
+ echo "*** test transient service drop-ins"
|
|
+
|
|
+ mkdir -p /etc/systemd/system/service.d
|
|
+ mkdir -p /etc/systemd/system/a-.service.d
|
|
+ mkdir -p /etc/systemd/system/a-b-.service.d
|
|
+ mkdir -p /etc/systemd/system/a-b-c.service.d
|
|
+
|
|
+ echo -e '[Service]\nStandardInputText=aaa' >/etc/systemd/system/service.d/drop1.conf
|
|
+ echo -e '[Service]\nStandardInputText=bbb' >/etc/systemd/system/a-.service.d/drop2.conf
|
|
+ echo -e '[Service]\nStandardInputText=ccc' >/etc/systemd/system/a-b-.service.d/drop3.conf
|
|
+ echo -e '[Service]\nStandardInputText=ddd' >/etc/systemd/system/a-b-c.service.d/drop4.conf
|
|
+
|
|
+ # There's no fragment yet, so this fails
|
|
+ systemctl cat a-b-c.service && exit 1
|
|
+
|
|
+ # xxx → eHh4Cg==
|
|
+ systemd-run --unit a-b-c.service -p StandardInputData=eHh4Cg== sleep infinity
|
|
+
|
|
+ data=$(systemctl show --value -p StandardInputData a-b-c.service)
|
|
+ # xxx\naaa\n\bbb\nccc\nddd\n → eHh4…
|
|
+ test "$data" = "eHh4CmFhYQpiYmIKY2NjCmRkZAo="
|
|
+
|
|
+ # Do a reload and check again
|
|
+ systemctl daemon-reload
|
|
+ data=$(systemctl show --value -p StandardInputData a-b-c.service)
|
|
+ test "$data" = "eHh4CmFhYQpiYmIKY2NjCmRkZAo="
|
|
+
|
|
+ clear_units a-b-c.service
|
|
+ rm /etc/systemd/system/service.d/drop1.conf \
|
|
+ /etc/systemd/system/a-.service.d/drop2.conf \
|
|
+ /etc/systemd/system/a-b-.service.d/drop3.conf
|
|
+}
|
|
+
|
|
test_template_dropins () {
|
|
echo "Testing template dropins..."
|
|
|
|
@@ -420,6 +455,7 @@ test_invalid_dropins () {
|
|
test_basic_dropins
|
|
test_hierarchical_service_dropins
|
|
test_hierarchical_slice_dropins
|
|
+test_transient_service_dropins
|
|
test_template_dropins
|
|
test_alias_dropins
|
|
test_masked_dropins
|