dbus: expose cgroup properties in introspection everywhere

diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index c5908dd9768657e5483d90456a257b2f64698073..4ce1e7e7fa0dc5dc4d2de2348d3dddf0ff770be6 100644 (file)
--- 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 ae04ab8c47ac81538b475c4bc92ba16bd04d74d3..ef55fcb173d27bf12589ed9c4ec78ffbb95609af 100644 (file)
--- 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 e93ac55115baa428ff5eb96818e6fb7c411622ff..e5e95a1ab9c8644695e7efeee659ee8876c4275a 100644 (file)
--- 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 db356adf306e7c23aeda104a72b6b0f9cd21a9ae..3b677792fd7644fa477d83f109628f9133117c66 100644 (file)
--- 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 7ef55ec711cfaf41d36a4abe5848a825e748d82b..a431fa1921b29b5725e76f80e85b5ba9cbd6a1ee 100644 (file)
--- 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 0248b4b391d3886b22df6451e2b1ce9f164879d3..d854e0fb5efd1e2ddc4c2b3d8b0420431f602b29 100644 (file)
--- 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"