testing: Fix systemctl wrapper and adapt enabling services on winnetou

The wrapper called the command twice for any unit but "strongswan" and
it didn't return the correct exit code.  This was noticed when an
if-updown script tried to check if systemd-resolved is active and always
succeeded, which caused failing attempts to configure it.

But now that the return code is correct, trying to enable bind9 won't
fail silently anymore if the unit doesn't exist (similar on older systems
for named), so this is adapted.
This commit is contained in:
Tobias Brunner
2023-07-13 10:48:53 +02:00
parent c1dbce29ed
commit 6b8b67be81
2 changed files with 17 additions and 5 deletions
@@ -8,7 +8,7 @@ ORIG=/bin/systemctl
CONF=/lib/systemd/system/strongswan.service
if [[ "$2" != "strongswan" ]]; then
$ORIG "$@"
exec $ORIG "$@"
fi
if [[ "$1" == "start" && -n $LEAK_DETECTIVE_LOG ]]; then
@@ -16,7 +16,10 @@ if [[ "$1" == "start" && -n $LEAK_DETECTIVE_LOG ]]; then
fi
$ORIG "$@"
STATUS=$?
if [[ "$1" == "stop" ]]; then
sed -i '/LEAK_DETECTIVE_LOG/d' $CONF 2>/dev/null
fi
exit $STATUS