]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: update 'show' format for socket units
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 1 Feb 2018 06:18:17 +0000 (15:18 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 5 Feb 2018 06:27:47 +0000 (15:27 +0900)
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

index 99136d4a0dd1d53653dfc4e5a04da997c2937ea6..dea7d3a859ef6051b766e228badb2cfadbd317dc 100644 (file)
@@ -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);