diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-07-01 00:01:29 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-07-01 00:18:00 +0200 |
| commit | 6a95dff87daf899a96135c7ab87aa1b1a67f6afc (patch) | |
| tree | ece9db42d62aab5bc12c262e1d0ab6ba3340f4ab | |
| parent | service: correct service bus introspection for timeouts (diff) | |
| download | systemd-6a95dff87daf899a96135c7ab87aa1b1a67f6afc.tar.xz systemd-6a95dff87daf899a96135c7ab87aa1b1a67f6afc.zip | |
dbus: expose cgroup properties in introspection everywhere
| -rw-r--r-- | src/core/dbus-cgroup.h | 2 | ||||
| -rw-r--r-- | src/core/dbus-mount.c | 1 | ||||
| -rw-r--r-- | src/core/dbus-service.c | 1 | ||||
| -rw-r--r-- | src/core/dbus-slice.c | 1 | ||||
| -rw-r--r-- | src/core/dbus-socket.c | 1 | ||||
| -rw-r--r-- | src/core/dbus-swap.c | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h index c5908dd976..4ce1e7e7fa 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 ae04ab8c47..ef55fcb173 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 e93ac55115..e5e95a1ab9 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 db356adf30..3b677792fd 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 7ef55ec711..a431fa1921 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 0248b4b391..d854e0fb5e 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" |