[systemd-commits] 2 commits - man/systemd-machined.service.xml src/login src/machine

[Lennart Poettering]

 man/systemd-machined.service.xml |   12 ++++++++++--
 src/login/logind-session-dbus.c  |    1 -
 src/machine/machine-dbus.c       |    1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 5d48cd27270e74f878f6ed3fe119e4cf3ef7f84e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 19 02:47:05 2013 +0200

    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 7aba347..62b9ffd 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 243b860..6e1b8f8 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 },

commit 98653cfb5005d0f505c48287d233d270ae6e75d6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jul 19 02:46:27 2013 +0200

    man: add reference to new machined bus API documentation in the wiki

diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml
index a9205d0..525944b 100644
--- a/man/systemd-machined.service.xml
+++ b/man/systemd-machined.service.xml
@@ -61,8 +61,16 @@
                 and containers, and processes belonging to
                 them.</para>
 
-                <para>See <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> for some examples how to
-                start a container the systemd way.</para>
+                <para>See
+                <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                for some examples how to start a container the systemd
+                way.</para>
+
+                <para>See the <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/machined">
+                machined D-Bus API Documentation</ulink> for information about
+                the APIs <filename>systemd-machined</filename>
+                provides.</para>
         </refsect1>
 
         <refsect1>