X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-slice.c;h=3b677792fd7644fa477d83f109628f9133117c66;hp=8a318faa554a1038faf2856882b6306bbe98e874;hb=6a95dff87daf899a96135c7ab87aa1b1a67f6afc;hpb=a016b9228f338cb9b380ce7e00826ef462767d98

diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 8a318faa5..3b677792f 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -22,13 +22,14 @@
 #include <errno.h>
 
 #include "dbus-unit.h"
-#include "dbus-slice.h"
 #include "dbus-common.h"
+#include "dbus-cgroup.h"
 #include "selinux-access.h"
+#include "dbus-slice.h"
 
 #define BUS_SLICE_INTERFACE                                             \
         " <interface name=\"org.freedesktop.systemd1.Slice\">\n"        \
-        BUS_UNIT_CGROUP_INTERFACE                                       \
+        BUS_CGROUP_CONTEXT_INTERFACE                                    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -48,13 +49,43 @@
 const char bus_slice_interface[] _introspect_("Slice") = BUS_SLICE_INTERFACE;
 
 DBusHandlerResult bus_slice_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
+        Slice *s = SLICE(u);
+
         const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",  bus_unit_properties,             u },
-                { "org.freedesktop.systemd1.Slice", bus_unit_cgroup_properties,      u },
-                { NULL, }
+                { "org.freedesktop.systemd1.Unit",  bus_unit_properties,           u },
+                { "org.freedesktop.systemd1.Slice", bus_cgroup_context_properties, &s->cgroup_context },
+                {}
         };
 
         SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
 
         return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
 }
+
+int bus_slice_set_property(
+                Unit *u,
+                const char *name,
+                DBusMessageIter *i,
+                UnitSetPropertiesMode mode,
+                DBusError *error) {
+
+        Slice *s = SLICE(u);
+        int r;
+
+        assert(name);
+        assert(u);
+        assert(i);
+
+        r = bus_cgroup_set_property(u, &s->cgroup_context, name, i, mode, error);
+        if (r != 0)
+                return r;
+
+        return 0;
+}
+
+int bus_slice_commit_properties(Unit *u) {
+        assert(u);
+
+        unit_realize_cgroup(u);
+        return 0;
+}