chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: move lid switch handling from logind-main to logind-core
[elogind.git]
/
src
/
core
/
slice.c
diff --git
a/src/core/slice.c
b/src/core/slice.c
index 557f8290883c1a794511cace3509e4f07ed388ce..ae9a54ba699e608d021d18c7057720ad561b0c70 100644
(file)
--- a/
src/core/slice.c
+++ b/
src/core/slice.c
@@
-43,6
+43,7
@@
static void slice_init(Unit *u) {
assert(u->load_state == UNIT_STUB);
cgroup_context_init(&s->cgroup_context);
assert(u->load_state == UNIT_STUB);
cgroup_context_init(&s->cgroup_context);
+ unit_cgroup_context_init_defaults(u, &s->cgroup_context);
}
static void slice_done(Unit *u) {
}
static void slice_done(Unit *u) {
@@
-103,7
+104,10
@@
static int slice_add_default_dependencies(Slice *s) {
assert(s);
/* Make sure slices are unloaded on shutdown */
assert(s);
/* Make sure slices are unloaded on shutdown */
- r = unit_add_dependency_by_name(UNIT(s), UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ r = unit_add_two_dependencies_by_name(
+ UNIT(s),
+ UNIT_BEFORE, UNIT_CONFLICTS,
+ SPECIAL_SHUTDOWN_TARGET, NULL, true);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-213,7
+217,7
@@
static int slice_stop(Unit *u) {
return 0;
}
return 0;
}
-static int slice_kill(Unit *u, KillWho who, int signo,
DBusE
rror *error) {
+static int slice_kill(Unit *u, KillWho who, int signo,
sd_bus_e
rror *error) {
return unit_kill_common(u, who, signo, -1, -1, error);
}
return unit_kill_common(u, who, signo, -1, -1, error);
}
@@
-272,13
+276,13
@@
DEFINE_STRING_TABLE_LOOKUP(slice_state, SliceState);
const UnitVTable slice_vtable = {
.object_size = sizeof(Slice),
const UnitVTable slice_vtable = {
.object_size = sizeof(Slice),
+ .cgroup_context_offset = offsetof(Slice, cgroup_context),
+
.sections =
"Unit\0"
"Slice\0"
"Install\0",
.sections =
"Unit\0"
"Slice\0"
"Install\0",
-
.private_section = "Slice",
.private_section = "Slice",
- .cgroup_context_offset = offsetof(Slice, cgroup_context),
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,
@@
-303,7
+307,7
@@
const UnitVTable slice_vtable = {
.sub_state_to_string = slice_sub_state_to_string,
.bus_interface = "org.freedesktop.systemd1.Slice",
.sub_state_to_string = slice_sub_state_to_string,
.bus_interface = "org.freedesktop.systemd1.Slice",
- .bus_
message_handler = bus_slice_message_handler
,
+ .bus_
vtable = bus_slice_vtable
,
.bus_set_property = bus_slice_set_property,
.bus_commit_properties = bus_slice_commit_properties,
.bus_set_property = bus_slice_set_property,
.bus_commit_properties = bus_slice_commit_properties,