diff options
| author | Mike Yuan <me@yhndnzj.com> | 2023-05-11 13:05:39 +0800 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-05-16 18:09:15 +0800 |
| commit | bae05711b5d06f330423f69d4d6500c907b8d322 (patch) | |
| tree | 301a265d515a68ac2f365e990aa32fe6be9b3e0f | |
| parent | f44744ff5120482e8a1f6222f091bd97dc65ed85 (diff) | |
| download | systemd-bae05711b5d06f330423f69d4d6500c907b8d322.tar.gz | |
loginctl: list-users: also show state
| -rw-r--r-- | src/login/loginctl.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index a2d03a9e64..4559b83e50 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -206,13 +206,15 @@ static int list_users(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - table = table_new("uid", "user", "linger"); + table = table_new("uid", "user", "linger", "state"); if (!table) return log_oom(); (void) table_set_align_percent(table, TABLE_HEADER_CELL(0), 100); for (;;) { + _cleanup_(sd_bus_error_free) sd_bus_error error_property = SD_BUS_ERROR_NULL; + _cleanup_free_ char *state = NULL; const char *user, *object; uint32_t uid; int linger; @@ -228,16 +230,39 @@ static int list_users(int argc, char *argv[], void *userdata) { object, "org.freedesktop.login1.User", "Linger", - &error, + &error_property, 'b', &linger); - if (r < 0) - return log_error_errno(r, "Failed to get linger status: %s", bus_error_message(&error, r)); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The user logged out when we're querying the property */ + continue; + + return log_error_errno(r, "Failed to get linger status for user %s: %s", + user, bus_error_message(&error_property, r)); + } + + r = sd_bus_get_property_string(bus, + "org.freedesktop.login1", + object, + "org.freedesktop.login1.User", + "State", + &error_property, + &state); + if (r < 0) { + if (sd_bus_error_has_name(&error_property, SD_BUS_ERROR_UNKNOWN_OBJECT)) + /* The user logged out when we're querying the property */ + continue; + + return log_error_errno(r, "Failed to get state for user %s: %s", + user, bus_error_message(&error_property, r)); + } r = table_add_many(table, TABLE_UID, (uid_t) uid, TABLE_STRING, user, - TABLE_BOOLEAN, linger); + TABLE_BOOLEAN, linger, + TABLE_STRING, state); if (r < 0) return table_log_add_error(r); } |