Zbigniew Jędrzejewski-Szmek
fb98c75e0e
This changes little in behaviour, the conceptual part is more important. The non-Ex variant is the actual name on the command line, and we should use the non-Ex D-Bus property too, if it works. This increases compatibility with old versions. But the code was mostly doing the right thing. Even the tests tested the right thing. Follow-up forb3d593673cand898fc00e79. The test is simplified by taking advantage of the fact that both names on the commandline are supposed to behave identically. Partially resolves https://github.com/systemd/systemd/issues/37174.
36 lines
1.3 KiB
Bash
Executable File
36 lines
1.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
set -eux
|
|
set -o pipefail
|
|
|
|
# Test ExecXYZEx= service unit dbus hookups
|
|
|
|
systemd-analyze log-level debug
|
|
|
|
declare -A property
|
|
|
|
property[1_one]=ExecCondition
|
|
property[2_two]=ExecStartPre
|
|
property[3_three]=ExecStart
|
|
property[4_four]=ExecStartPost
|
|
property[5_five]=ExecReload
|
|
property[6_six]=ExecStop
|
|
property[7_seven]=ExecStopPost
|
|
|
|
# These should all get upgraded to the corresponding Ex property as the non-Ex variant
|
|
# does not support the ":" prefix (no-env-expand).
|
|
for c in "${!property[@]}"; do
|
|
systemd-run --unit="$c" -r -p "Type=oneshot" -p "${property[$c]}=:/bin/echo \${$c}" true
|
|
systemctl show -p "${property[$c]}" "$c" | grep -F "path=/bin/echo ; argv[]=/bin/echo \${$c} ; ignore_errors=no"
|
|
systemctl show -p "${property[$c]}Ex" "$c" | grep -F "path=/bin/echo ; argv[]=/bin/echo \${$c} ; flags=no-env-expand"
|
|
done
|
|
|
|
# Ex names on the commandline are supported for backward compat.
|
|
for c in "${!property[@]}"; do
|
|
systemd-run --unit="${c}_ex" -r -p "Type=oneshot" -p "${property[$c]}Ex=:/bin/echo \${$c}" true
|
|
systemctl show -p "${property[$c]}" "$c" | grep -F "path=/bin/echo ; argv[]=/bin/echo \${$c} ; ignore_errors=no"
|
|
systemctl show -p "${property[$c]}Ex" "$c" | grep -F "path=/bin/echo ; argv[]=/bin/echo \${$c} ; flags=no-env-expand"
|
|
done
|
|
|
|
systemd-analyze log-level info
|