summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2022-03-21 16:10:30 +0100
committerFrantisek Sumsal <frantisek@sumsal.cz>2022-03-21 16:41:49 +0100
commit1b87ca4fe9e36c841a16883883b34b1472bec4af (patch)
tree08e48d925eaf964262f4f78896b2cbcd7265591f
parenttest: run test-shutdown.py in verbose mode (diff)
downloadsystemd-1b87ca4fe9e36c841a16883883b34b1472bec4af.tar.xz
systemd-1b87ca4fe9e36c841a16883883b34b1472bec4af.zip
test: use a dropin to override the end.service unit
instead of removing it.
-rwxr-xr-xtest/TEST-69-SHUTDOWN/test.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/TEST-69-SHUTDOWN/test.sh b/test/TEST-69-SHUTDOWN/test.sh
index 39adedaea1..c7f78fe3c9 100755
--- a/test/TEST-69-SHUTDOWN/test.sh
+++ b/test/TEST-69-SHUTDOWN/test.sh
@@ -24,7 +24,12 @@ EOF
test_append_files() {
local workspace="${1:?}"
# prevent shutdown in test suite, the expect script does that manually.
- rm "${workspace:?}/usr/lib/systemd/tests/testdata/units/end.service"
+ mkdir -p "${workspace:?}/etc/systemd/system/end.service.d"
+ cat >"$workspace/etc/systemd/system/end.service.d/99-override.conf" <<EOF
+[Service]
+ExecStart=
+ExecStart=/bin/true
+EOF
inst /usr/bin/screen
echo "PS1='screen\$WINDOW # '" >>"$workspace/root/.bashrc"
echo 'startup_message off' >"$workspace/etc/screenrc"