summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-02-01 15:18:17 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-02-05 15:27:47 +0900
commiteabc13c78109232f6d9b47dbbe692d9c82a09866 (patch)
tree91c9da0e01d0883fd03f52280e5544a1b54e8339
parentfa6dee52ca3db9e5922c59d9e386c70266f0b2b0 (diff)
downloadsystemd-eabc13c78109232f6d9b47dbbe692d9c82a09866.tar.gz
systemctl: update 'show' format for socket units
Before this. ``` $ systemctl show systemd-journald.socket | grep Listen ListenStream=/run/systemd/journal/stdout ListenDatagram=/run/systemd/journal/socket $ systemctl show --property ListenStream systemd-journald.socket $ systemctl show --property ListenDatagram systemd-journald.socket $ systemctl show --property Listen systemd-journald.socket ListenStream=/run/systemd/journal/stdout ListenDatagram=/run/systemd/journal/socket ``` After this. ``` $ systemctl show systemd-journald.socket | grep Listen Listen=/run/systemd/journal/stdout (Stream) Listen=/run/systemd/journal/socket (Datagram) $ systemctl show --property Listen systemd-journald.socket ListenStream=/run/systemd/journal/stdout ListenDatagram=/run/systemd/journal/socket ``` Fixes #8064.
-rw-r--r--src/systemctl/systemctl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 99136d4a0d..dea7d3a859 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4907,10 +4907,7 @@ static int print_property(const char *name, sd_bus_message *m, const char *conte
return bus_log_parse_error(r);
while ((r = sd_bus_message_read(m, "(ss)", &type, &path)) > 0)
- if (arg_value)
- puts(path);
- else
- printf("Listen%s=%s\n", type, path);
+ print_prop(name, "%s (%s)", path, type);
if (r < 0)
return bus_log_parse_error(r);