|
 |
ac3a84 |
From c2317e2a2be2dd39266b82712ec9569a86f7fde3 Mon Sep 17 00:00:00 2001
|
|
|
ac3a84 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
ac3a84 |
Date: Sun, 13 Nov 2022 21:10:56 +0900
|
|
|
ac3a84 |
Subject: [PATCH] systemctl: do not show unit properties with --all
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Fixes a bug introduced by a6e334649d4bdff0c6f664e98666b2223aa21a8b.
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Fixes #25343.
|
|
|
ac3a84 |
|
|
|
ac3a84 |
(cherry picked from commit 0b51a1c8c4c77f98a8c234cd2c7a7849329be027)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Related: #2138081
|
|
|
ac3a84 |
---
|
|
|
ac3a84 |
src/systemctl/systemctl-show.c | 7 ++++---
|
|
|
ac3a84 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
|
|
|
ac3a84 |
index 8d3db98c0a..24c7d564b8 100644
|
|
|
ac3a84 |
--- a/src/systemctl/systemctl-show.c
|
|
|
ac3a84 |
+++ b/src/systemctl/systemctl-show.c
|
|
|
ac3a84 |
@@ -2207,9 +2207,10 @@ int verb_show(int argc, char *argv[], void *userdata) {
|
|
|
ac3a84 |
|
|
|
ac3a84 |
if (!arg_states && !arg_types) {
|
|
|
ac3a84 |
if (show_mode == SYSTEMCTL_SHOW_PROPERTIES)
|
|
|
ac3a84 |
- r = show_one(bus, "/org/freedesktop/systemd1", NULL, show_mode, &new_line, &ellipsized);
|
|
|
ac3a84 |
- else
|
|
|
ac3a84 |
- r = show_system_status(bus);
|
|
|
ac3a84 |
+ /* systemctl show --all → show properties of the manager */
|
|
|
ac3a84 |
+ return show_one(bus, "/org/freedesktop/systemd1", NULL, show_mode, &new_line, &ellipsized);
|
|
|
ac3a84 |
+
|
|
|
ac3a84 |
+ r = show_system_status(bus);
|
|
|
ac3a84 |
if (r < 0)
|
|
|
ac3a84 |
return r;
|
|
|
ac3a84 |
|