machined: correct how some properties are exported on the bus

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 7aba3477aa397d857a8923c28e5c0bee55bd718a..62b9ffd52a7f150cd63e276640f8fa622b9b2157 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -62,7 +62,6 @@
         "  <property name=\"Class\" type=\"s\" access=\"read\"/>\n"     \
         "  <property name=\"Active\" type=\"b\" access=\"read\"/>\n"    \
         "  <property name=\"State\" type=\"s\" access=\"read\"/>\n"     \
-        "  <property name=\"KillProcesses\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"IdleHint\" type=\"b\" access=\"read\"/>\n"  \
         "  <property name=\"IdleSinceHint\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"IdleSinceHintMonotonic\" type=\"t\" access=\"read\"/>\n" \

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 243b8604cd960fc34402b7a63202dd0402aa50c1..6e1b8f8186050311c354a4ca5304bd1340be06dd 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -130,6 +130,7 @@ static const BusProperty bus_machine_machine_properties[] = {
         { "TimestampMonotonic",     bus_property_append_usec,          "t", offsetof(Machine, timestamp.monotonic) },
         { "Service",                bus_property_append_string,        "s", offsetof(Machine, service),            true },
         { "Scope",                  bus_property_append_string,        "s", offsetof(Machine, scope),              true },
+        { "Leader",                 bus_property_append_pid,           "u", offsetof(Machine, leader)              },
         { "Class",                  bus_machine_append_class,          "s", offsetof(Machine, class)               },
         { "State",                  bus_machine_append_state,          "s", 0                                      },
         { "RootDirectory",          bus_property_append_string,        "s", offsetof(Machine, root_directory),     true },