From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 30 Jun 2013 22:01:29 +0000 (+0200)
Subject: dbus: expose cgroup properties in introspection everywhere
X-Git-Tag: v205~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6a95dff87daf899a96135c7ab87aa1b1a67f6afc

dbus: expose cgroup properties in introspection everywhere
---

diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index c5908dd97..4ce1e7e7f 100644
--- a/src/core/dbus-cgroup.h
+++ b/src/core/dbus-cgroup.h
@@ -27,7 +27,7 @@
 #include "dbus-common.h"
 #include "cgroup.h"
 
-#define BUS_CGROUP_CONTEXT_INTERFACE \
+#define BUS_CGROUP_CONTEXT_INTERFACE                                    \
         "  <property name=\"CPUAccounting\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"CPUShares\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"BlockIOAccounting\" type=\"b\" access=\"read\"/>\n" \
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index ae04ab8c4..ef55fcb17 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -41,6 +41,7 @@
         BUS_EXEC_COMMAND_INTERFACE("ExecRemount")                       \
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         BUS_KILL_CONTEXT_INTERFACE                                      \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index e93ac5511..e5e95a1ab 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -54,6 +54,7 @@
         BUS_EXEC_COMMAND_INTERFACE("ExecStopPost")                      \
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         BUS_KILL_CONTEXT_INTERFACE                                      \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         "  <property name=\"PermissionsStartOnly\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"RootDirectoryStartOnly\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"RemainAfterExit\" type=\"b\" access=\"read\"/>\n" \
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index db356adf3..3b677792f 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -29,6 +29,7 @@
 
 #define BUS_SLICE_INTERFACE                                             \
         " <interface name=\"org.freedesktop.systemd1.Slice\">\n"        \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 7ef55ec71..a431fa192 100644
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -40,6 +40,7 @@
         BUS_EXEC_COMMAND_INTERFACE("ExecStopPost")                      \
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         BUS_KILL_CONTEXT_INTERFACE                                      \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"BindToDevice\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 0248b4b39..d854e0fb5 100644
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -39,6 +39,7 @@
         BUS_EXEC_COMMAND_INTERFACE("ExecDeactivate")                    \
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         BUS_KILL_CONTEXT_INTERFACE                                      \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"