77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From 99a6dc51727e6c26cf43566de481272773cb1a91 Mon Sep 17 00:00:00 2001
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
Date: Fri, 18 Feb 2022 23:09:18 +0100
|
|
Subject: [PATCH] systemctl: make `--timestamp=` affect the `show` verb as well
|
|
|
|
Currently the `--timestamp=` option has no effect on timestamps shown by
|
|
`systemctl show`, let's fix that.
|
|
|
|
Spotted in #22567.
|
|
|
|
Before:
|
|
```
|
|
$ systemctl show --timestamp=us+utc systemd-journald | grep Timestamp=
|
|
ExecMainStartTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
StateChangeTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
InactiveExitTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
ActiveEnterTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
ActiveExitTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
InactiveEnterTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
ConditionTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
AssertTimestamp=Sat 2021-12-11 15:25:57 CET
|
|
```
|
|
|
|
After:
|
|
```
|
|
$ systemctl show --timestamp=us+utc systemd-journald | grep Timestamp=
|
|
ExecMainStartTimestamp=Sat 2021-12-11 14:25:57.177848 UTC
|
|
StateChangeTimestamp=Sat 2021-12-11 14:25:57.196714 UTC
|
|
InactiveExitTimestamp=Sat 2021-12-11 14:25:57.177871 UTC
|
|
ActiveEnterTimestamp=Sat 2021-12-11 14:25:57.196714 UTC
|
|
ActiveExitTimestamp=Sat 2021-12-11 14:25:57.144677 UTC
|
|
InactiveEnterTimestamp=Sat 2021-12-11 14:25:57.176331 UTC
|
|
ConditionTimestamp=Sat 2021-12-11 14:25:57.176980 UTC
|
|
AssertTimestamp=Sat 2021-12-11 14:25:57.176980 UTC
|
|
|
|
```
|
|
|
|
(cherry picked from commit a59e5c625da5a6e0c46e493d55f2f4212e9457ca)
|
|
(cherry picked from commit e59c381e2321ae9e476c550d5a3d43a1fd0493ac)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/99a6dc51727e6c26cf43566de481272773cb1a91
|
|
---
|
|
src/systemctl/systemctl-show.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
|
|
index dd99bc5323..5b6ee3c518 100644
|
|
--- a/src/systemctl/systemctl-show.c
|
|
+++ b/src/systemctl/systemctl-show.c
|
|
@@ -1006,6 +1006,22 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
|
|
}
|
|
break;
|
|
|
|
+ case SD_BUS_TYPE_UINT64:
|
|
+ if (endswith(name, "Timestamp")) {
|
|
+ char timestamp_str[FORMAT_TIMESTAMP_MAX] = "n/a";
|
|
+ uint64_t timestamp;
|
|
+
|
|
+ r = sd_bus_message_read_basic(m, bus_type, ×tamp);
|
|
+ if (r < 0)
|
|
+ return r;
|
|
+
|
|
+ (void) format_timestamp_style(timestamp_str, sizeof(timestamp_str), timestamp, arg_timestamp_style);
|
|
+ bus_print_property_value(name, expected_value, flags, timestamp_str);
|
|
+
|
|
+ return 1;
|
|
+ }
|
|
+ break;
|
|
+
|
|
case SD_BUS_TYPE_STRUCT:
|
|
|
|
if (contents[0] == SD_BUS_TYPE_UINT32 && streq(name, "Job")) {
|
|
--
|
|
2.33.0
|
|
|