chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: really stop watchdog timer when stopping
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index bc41617bf7ec518493627b6d8611062ec3cfb7bb..593946e5172e61517a8d7870fb7763857ae816d3 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-1550,7
+1550,7
@@
static void service_set_state(Service *s, ServiceState state) {
service_connection_unref(s);
}
service_connection_unref(s);
}
- if (state == SERVICE_STOP)
+ if (state == SERVICE_STOP
|| state == SERVICE_STOP_SIGTERM
)
service_stop_watchdog(s);
/* For the inactive states unit_notify() will trim the cgroup,
service_stop_watchdog(s);
/* For the inactive states unit_notify() will trim the cgroup,
@@
-3832,13
+3832,15
@@
DEFINE_STRING_TABLE_LOOKUP(start_limit_action, StartLimitAction);
const UnitVTable service_vtable = {
.object_size = sizeof(Service),
const UnitVTable service_vtable = {
.object_size = sizeof(Service),
- .exec_context_offset = offsetof(Service, exec_context),
.sections =
"Unit\0"
"Service\0"
"Install\0",
.sections =
"Unit\0"
"Service\0"
"Install\0",
+ .exec_context_offset = offsetof(Service, exec_context),
+ .exec_section = "Service",
+
.init = service_init,
.done = service_done,
.load = service_load,
.init = service_init,
.done = service_done,
.load = service_load,