diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-04-13 20:59:01 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-04-13 20:59:01 +0200 |
| commit | 10a94420172b33a7472a16b2e829689dbc570cad (patch) | |
| tree | 5499d906a3d812ab936d16faceaf1741bd6d0c2f /dbus-manager.c | |
| parent | c27488016e0e90569260bc513fa95acbad512ff5 (diff) | |
systemctl: show sub state along active state
Diffstat (limited to 'dbus-manager.c')
| -rw-r--r-- | dbus-manager.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dbus-manager.c b/dbus-manager.c index a8661bace3..5f3d964777 100644 --- a/dbus-manager.c +++ b/dbus-manager.c @@ -42,7 +42,7 @@ " </method>" \ " <method name=\"ClearJobs\"/>" \ " <method name=\"ListUnits\">" \ - " <arg name=\"units\" type=\"a(ssssouso)\" direction=\"out\"/>" \ + " <arg name=\"units\" type=\"a(sssssouso)\" direction=\"out\"/>" \ " </method>" \ " <method name=\"ListJobs\">" \ " <arg name=\"jobs\" type=\"a(usssoo)\" direction=\"out\"/>" \ @@ -234,12 +234,12 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection dbus_message_iter_init_append(reply, &iter); - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(ssssouso)", &sub)) + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(sssssouso)", &sub)) goto oom; HASHMAP_FOREACH_KEY(u, k, m->units, i) { char *u_path, *j_path; - const char *id, *description, *load_state, *active_state, *job_type; + const char *id, *description, *load_state, *active_state, *sub_state, *job_type; DBusMessageIter sub2; uint32_t job_id; @@ -253,6 +253,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection description = unit_description(u); load_state = unit_load_state_to_string(u->meta.load_state); active_state = unit_active_state_to_string(unit_active_state(u)); + sub_state = unit_sub_state_to_string(u); if (!(u_path = unit_dbus_path(u))) goto oom; @@ -276,6 +277,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &description) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &load_state) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &active_state) || + !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sub_state) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &u_path) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &job_id) || !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &job_type) || |