systemd/0179-test-support-a-non-default-SysV-directory.patch
Jan Macku eceb26ad96 systemd-252-3
Resolves: #2138081,#2141979,#2151993,#2155517,#2160477
2023-01-16 09:56:47 +01:00

98 lines
4.3 KiB
Diff

From 956944405391b5bbb8a4fee9ad93e14bf908f0a9 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 13 Jan 2023 20:10:42 +0100
Subject: [PATCH] test: support a non-default SysV directory
Since the directory is configurable via -Dsysvinit-path= during build,
it makes the test fail on Fedora/RHEL/CentOS, where it's set to
/etc/rc.d/init.d, instead of the default /etc/init.d. Since we can't get
the value at runtime (in a reasonable manner), let's just support the
two most common paths for now.
Follow up to 7fcf0fab078ed92a4f6c3c3658c0a9dfd67c9601.
(cherry picked from commit fc2a0bc05e0429e468c7eaad52998292105fe7fb)
Related: #2160477
---
test/units/testsuite-26.sh | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh
index 37ae6069bc..916a6704d7 100755
--- a/test/units/testsuite-26.sh
+++ b/test/units/testsuite-26.sh
@@ -294,9 +294,12 @@ systemctl unset-environment IMPORT_THIS IMPORT_THIS_TOO
# test for sysv-generator (issue #24990)
if [[ -x /usr/lib/systemd/system-generators/systemd-sysv-generator ]]; then
- mkdir -p /etc/init.d
+ # This is configurable via -Dsysvinit-path=, but we can't get the value
+ # at runtime, so let's just support the two most common paths for now.
+ [[ -d /etc/rc.d/init.d ]] && SYSVINIT_PATH="/etc/rc.d/init.d" || SYSVINIT_PATH="/etc/init.d"
+
# invalid dependency
- cat >/etc/init.d/issue-24990 <<\EOF
+ cat >"${SYSVINIT_PATH:?}/issue-24990" <<\EOF
#!/bin/bash
### BEGIN INIT INFO
@@ -322,21 +325,21 @@ case "$1" in
esac
EOF
- chmod +x /etc/init.d/issue-24990
+ chmod +x "$SYSVINIT_PATH/issue-24990"
systemctl daemon-reload
[[ -L /run/systemd/generator.late/test1.service ]]
[[ -L /run/systemd/generator.late/test2.service ]]
assert_eq "$(readlink -f /run/systemd/generator.late/test1.service)" "/run/systemd/generator.late/issue-24990.service"
assert_eq "$(readlink -f /run/systemd/generator.late/test2.service)" "/run/systemd/generator.late/issue-24990.service"
output=$(systemctl cat issue-24990)
- assert_in "SourcePath=/etc/init.d/issue-24990" "$output"
+ assert_in "SourcePath=$SYSVINIT_PATH/issue-24990" "$output"
assert_in "Description=LSB: Test" "$output"
assert_in "After=test1.service" "$output"
assert_in "After=remote-fs.target" "$output"
assert_in "After=network-online.target" "$output"
assert_in "Wants=network-online.target" "$output"
- assert_in "ExecStart=/etc/init.d/issue-24990 start" "$output"
- assert_in "ExecStop=/etc/init.d/issue-24990 stop" "$output"
+ assert_in "ExecStart=$SYSVINIT_PATH/issue-24990 start" "$output"
+ assert_in "ExecStop=$SYSVINIT_PATH/issue-24990 stop" "$output"
systemctl status issue-24990 || :
systemctl show issue-24990
assert_not_in "issue-24990.service" "$(systemctl show --property=After --value)"
@@ -350,7 +353,7 @@ EOF
systemctl stop issue-24990
# valid dependency
- cat >/etc/init.d/issue-24990 <<\EOF
+ cat >"$SYSVINIT_PATH/issue-24990" <<\EOF
#!/bin/bash
### BEGIN INIT INFO
@@ -376,18 +379,18 @@ case "$1" in
esac
EOF
- chmod +x /etc/init.d/issue-24990
+ chmod +x "$SYSVINIT_PATH/issue-24990"
systemctl daemon-reload
[[ -L /run/systemd/generator.late/test1.service ]]
[[ -L /run/systemd/generator.late/test2.service ]]
assert_eq "$(readlink -f /run/systemd/generator.late/test1.service)" "/run/systemd/generator.late/issue-24990.service"
assert_eq "$(readlink -f /run/systemd/generator.late/test2.service)" "/run/systemd/generator.late/issue-24990.service"
output=$(systemctl cat issue-24990)
- assert_in "SourcePath=/etc/init.d/issue-24990" "$output"
+ assert_in "SourcePath=$SYSVINIT_PATH/issue-24990" "$output"
assert_in "Description=LSB: Test" "$output"
assert_in "After=remote-fs.target" "$output"
- assert_in "ExecStart=/etc/init.d/issue-24990 start" "$output"
- assert_in "ExecStop=/etc/init.d/issue-24990 stop" "$output"
+ assert_in "ExecStart=$SYSVINIT_PATH/issue-24990 start" "$output"
+ assert_in "ExecStop=$SYSVINIT_PATH/issue-24990 stop" "$output"
systemctl status issue-24990 || :
systemctl show issue-24990
assert_not_in "issue-24990.service" "$(systemctl show --property=After --value)"