diff --git a/man/systemctl.xml b/man/systemctl.xml
index e8d5f9f4d8..fe8b77423a 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1502,6 +1502,17 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
+
+
+
+
+ Equivalent to , i.e. shows the
+ value of the property without the property name or =. Note that using
+ once will also affect all properties listed with
+ /.
+
+
+
@@ -1627,9 +1638,8 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
- When printing properties with show,
- only print the value, and skip the property name and
- =.
+ When printing properties with show, only print the value, and skip the
+ property name and =. Also see option above.
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 58b0fd3688..dcd93fce17 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7966,6 +7966,7 @@ static int systemctl_help(void) {
" --state=STATE List units with particular LOAD or SUB or ACTIVE state\n"
" --failed Shorcut for --state=failed\n"
" -p --property=NAME Show only properties by this name\n"
+ " -P NAME Equivalent to --value --property=NAME\n"
" -a --all Show all properties/all units currently in memory,\n"
" including dead/empty ones. To list all units installed\n"
" on the system, use 'list-unit-files' instead.\n"
@@ -8334,7 +8335,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
/* we default to allowing interactive authorization only in systemctl (not in the legacy commands) */
arg_ask_password = true;
- while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:iTr.::", options, NULL)) >= 0)
+ while ((c = getopt_long(argc, argv, "ht:p:P:alqfs:H:M:n:o:iTr.::", options, NULL)) >= 0)
switch (c) {
@@ -8389,6 +8390,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
break;
}
+ case 'P':
+ arg_value = true;
+ _fallthrough_;
+
case 'p':
/* Make sure that if the empty property list was specified, we won't show any
properties. */
@@ -8413,9 +8418,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
}
}
- /* If the user asked for a particular
- * property, show it to him, even if it is
- * empty. */
+ /* If the user asked for a particular property, show it, even if it is empty. */
arg_all = true;
break;
diff --git a/test/units/testsuite-05.sh b/test/units/testsuite-05.sh
index eed30c8b85..9168e72799 100755
--- a/test/units/testsuite-05.sh
+++ b/test/units/testsuite-05.sh
@@ -13,11 +13,11 @@ EOF
systemctl daemon-reload
-[[ "$(systemctl show --value -p DefaultLimitNOFILESoft)" = "10000" ]]
-[[ "$(systemctl show --value -p DefaultLimitNOFILE)" = "16384" ]]
+[[ "$(systemctl show -P DefaultLimitNOFILESoft)" = "10000" ]]
+[[ "$(systemctl show -P DefaultLimitNOFILE)" = "16384" ]]
-[[ "$(systemctl show --value -p LimitNOFILESoft testsuite-05.service)" = "10000" ]]
-[[ "$(systemctl show --value -p LimitNOFILE testsuite-05.service)" = "16384" ]]
+[[ "$(systemctl show -P LimitNOFILESoft testsuite-05.service)" = "10000" ]]
+[[ "$(systemctl show -P LimitNOFILE testsuite-05.service)" = "16384" ]]
systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
systemd-run --wait -t bash -c '[[ "$(ulimit -n -H)" = "16384" ]]'
diff --git a/test/units/testsuite-20.sh b/test/units/testsuite-20.sh
index c038c05fa7..d94f6b2afb 100755
--- a/test/units/testsuite-20.sh
+++ b/test/units/testsuite-20.sh
@@ -5,7 +5,7 @@ set -o pipefail
systemd-analyze log-level debug
systemd-analyze log-target console
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Start a test process inside of our own cgroup
sleep infinity &
@@ -14,45 +14,45 @@ disown
# Start a test process outside of our own cgroup
systemd-run -p DynamicUser=1 --unit=test20-sleep.service /bin/sleep infinity
-EXTERNALPID=`systemctl show -p MainPID --value test20-sleep.service`
+EXTERNALPID=`systemctl show -P MainPID test20-sleep.service`
# Update our own main PID to the external test PID, this should work
systemd-notify MAINPID=$EXTERNALPID
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $EXTERNALPID
+test `systemctl show -P MainPID testsuite-20.service` -eq $EXTERNALPID
# Update our own main PID to the internal test PID, this should work, too
systemd-notify MAINPID=$INTERNALPID
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $INTERNALPID
+test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID
# Update it back to our own PID, this should also work
systemd-notify MAINPID=$$
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Try to set it to PID 1, which it should ignore, because that's the manager
systemd-notify MAINPID=1
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Try to set it to PID 0, which is invalid and should be ignored
systemd-notify MAINPID=0
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Try to set it to a valid but non-existing PID, which should be ignored. (Note
# that we set the PID to a value well above any known /proc/sys/kernel/pid_max,
# which means we can be pretty sure it doesn't exist by coincidence)
systemd-notify MAINPID=1073741824
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Change it again to the external PID, without privileges this time. This should be ignored, because the PID is from outside of our cgroup and we lack privileges.
systemd-notify --uid=1000 MAINPID=$EXTERNALPID
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
# Change it again to the internal PID, without privileges this time. This should work, as the process is on our cgroup, and that's enough even if we lack privileges.
systemd-notify --uid=1000 MAINPID=$INTERNALPID
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $INTERNALPID
+test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID
# Update it back to our own PID, this should also work
systemd-notify --uid=1000 MAINPID=$$
-test `systemctl show -p MainPID --value testsuite-20.service` -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
cat >/tmp/test20-mainpid.sh </tmp/test20-mainpid2.sh </dev/shm/test20-mainpid3.sh </proc/sysrq-trigger
while : ; do
- STATE=`systemctl show -p ActiveState --value oomtest.service`
+ STATE=`systemctl show -P ActiveState oomtest.service`
[ "$STATE" = "failed" ] && break
sleep .5
done
- RESULT=`systemctl show -p Result --value oomtest.service`
+ RESULT=`systemctl show -P Result oomtest.service`
test "$RESULT" = "oom-kill"
systemd-analyze log-level info
diff --git a/test/units/testsuite-41.sh b/test/units/testsuite-41.sh
index e3c5f1dad6..81fa1716f1 100755
--- a/test/units/testsuite-41.sh
+++ b/test/units/testsuite-41.sh
@@ -12,10 +12,10 @@ systemd-analyze log-target console
! systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1"
for ((secs=0; secs<$MAX_SECS; secs++)); do
- [[ "$(systemctl show one.service -p NRestarts --value)" -le 0 ]] || break
+ [[ "$(systemctl show one.service -P NRestarts)" -le 0 ]] || break
sleep 1
done
-if [[ "$(systemctl show one.service -p NRestarts --value)" -le 0 ]]; then
+if [[ "$(systemctl show one.service -P NRestarts)" -le 0 ]]; then
exit 1
fi