aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-19 02:47:05 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-19 02:47:21 +0200
commit5d48cd27270e74f878f6ed3fe119e4cf3ef7f84e (patch)
tree1cc3c118898f8c34a1b5043d27b1166f1101d2d5
parentman: add reference to new machined bus API documentation in the wiki (diff)
downloadsystemd-5d48cd27270e74f878f6ed3fe119e4cf3ef7f84e.tar.gz
systemd-5d48cd27270e74f878f6ed3fe119e4cf3ef7f84e.tar.bz2
systemd-5d48cd27270e74f878f6ed3fe119e4cf3ef7f84e.zip
machined: correct how some properties are exported on the bus
-rw-r--r--src/login/logind-session-dbus.c1
-rw-r--r--src/machine/machine-dbus.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 7aba3477a..62b9ffd52 100644
--- 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 243b8604c..6e1b8f818 100644
--- 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 },