From c3d83ff9403b40c3f9ac3c9bf3ee00eeea1289da Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 21 Mar 2022 15:55:49 +0100
Subject: test: don't try to execute a non-existing script

---
 test/units/testsuite-69.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/units/testsuite-69.service b/test/units/testsuite-69.service
index 3b2b81edc8..7aa0664b85 100644
--- a/test/units/testsuite-69.service
+++ b/test/units/testsuite-69.service
@@ -4,4 +4,4 @@ Description=TEST-69-SHUTDOWN
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+ExecStart=/bin/true
-- 
cgit v1.2.1


From 3fe2885cc5aca994c0d6aec3489c0bb5e37604d7 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 21 Mar 2022 15:58:51 +0100
Subject: test: run test-shutdown.py in verbose mode

To make the debugging of spurious fails a bit easier.
---
 test/TEST-69-SHUTDOWN/test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/TEST-69-SHUTDOWN/test.sh b/test/TEST-69-SHUTDOWN/test.sh
index dd7b8998b5..39adedaea1 100755
--- a/test/TEST-69-SHUTDOWN/test.sh
+++ b/test/TEST-69-SHUTDOWN/test.sh
@@ -13,11 +13,11 @@ _ORIG_NSPAWN="${SYSTEMD_NSPAWN:?}"
 SYSTEMD_NSPAWN="${STATEDIR:?}/run-nspawn"
 
 setup_nspawn_root_hook() {
-    cat > "${STATEDIR:?}"/run-nspawn <<-EOF
-	#!/bin/bash
-	exec "${TEST_BASE_DIR:?}"/test-shutdown.py -- "$_ORIG_NSPAWN" "\$@"
-	exit 1
-	EOF
+    cat >"${STATEDIR:?}/run-nspawn" <<EOF
+#!/bin/bash
+exec "${TEST_BASE_DIR:?}/test-shutdown.py" -v -- "$_ORIG_NSPAWN" "\$@"
+exit 1
+EOF
     chmod 755 "${STATEDIR:?}"/run-nspawn
 }
 
-- 
cgit v1.2.1


From 1b87ca4fe9e36c841a16883883b34b1472bec4af Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 21 Mar 2022 16:10:30 +0100
Subject: test: use a dropin to override the end.service unit

instead of removing it.
---
 test/TEST-69-SHUTDOWN/test.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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"
-- 
cgit v1.2.1