chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible lack of status messages on shutdown/reboot
[elogind.git]
/
src
/
core
/
slice.c
diff --git
a/src/core/slice.c
b/src/core/slice.c
index df2d91e47308805049c2a9ade7dec7388e669374..40d416e35ee53e44088b52b4e6ce2db7e71e0004 100644
(file)
--- a/
src/core/slice.c
+++ b/
src/core/slice.c
@@
-103,7
+103,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;
@@
-304,6
+307,8
@@
const UnitVTable slice_vtable = {
.bus_interface = "org.freedesktop.systemd1.Slice",
.bus_message_handler = bus_slice_message_handler,
.bus_interface = "org.freedesktop.systemd1.Slice",
.bus_message_handler = bus_slice_message_handler,
+ .bus_set_property = bus_slice_set_property,
+ .bus_commit_properties = bus_slice_commit_properties,
.status_message_formats = {
.finished_start_job = {
.status_message_formats = {
.finished_start_job = {