From eabc13c78109232f6d9b47dbbe692d9c82a09866 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 1 Feb 2018 15:18:17 +0900 Subject: [PATCH] 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. --- src/systemctl/systemctl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 99136d4a0dd..dea7d3a859e 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); -- 2.47.3