chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timedatectl: clear ADJ_MAXERROR to make sure we keep STA_SYNC set
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index 697777425780512128cbcc0dca91b782169b898f..386692a10aaa81c3a9bc3e837b04e9a4768c911a 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-361,7
+361,7
@@
static int service_arm_timer(Service *s, usec_t usec) {
static char *sysv_translate_name(const char *name) {
char *r;
static char *sysv_translate_name(const char *name) {
char *r;
- r = new(char, strlen(name) + s
izeof(".service")
);
+ r = new(char, strlen(name) + s
trlen(".service") + 1
);
if (!r)
return NULL;
if (!r)
return NULL;
@@
-1436,9
+1436,7
@@
static int service_search_main_pid(Service *s) {
log_warning_unit(UNIT(s)->id,
"Failed to watch PID "PID_FMT" from service %s",
pid, UNIT(s)->id);
log_warning_unit(UNIT(s)->id,
"Failed to watch PID "PID_FMT" from service %s",
pid, UNIT(s)->id);
- return r;
-
- return 0;
+ return r;
}
static void service_set_state(Service *s, ServiceState state) {
}
static void service_set_state(Service *s, ServiceState state) {
@@
-1772,6
+1770,7
@@
static int service_spawn(
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
path,
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
path,
+ manager_get_runtime_prefix(UNIT(s)->manager),
UNIT(s)->id,
s->watchdog_usec,
s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
UNIT(s)->id,
s->watchdog_usec,
s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
@@
-1873,10
+1872,13
@@
static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
s->forbid_restart = false;
s->forbid_restart = false;
- /*
w
e want fresh tmpdirs in case service is started again immediately */
+ /*
W
e want fresh tmpdirs in case service is started again immediately */
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
+ /* Also, remove the runtime directory in */
+ exec_context_destroy_runtime_directory(&s->exec_context, manager_get_runtime_prefix(UNIT(s)->manager));
+
/* Try to delete the pid file. At this point it will be
* out-of-date, and some software might be confused by it, so
* let's remove it. */
/* Try to delete the pid file. At this point it will be
* out-of-date, and some software might be confused by it, so
* let's remove it. */
@@
-3414,7
+3416,7
@@
static void service_notify_message(Unit *u, pid_t pid, char **tags) {
free(t);
}
free(t);
}
- /* Interpet WATCHDOG= */
+ /* Interp
r
et WATCHDOG= */
if (strv_find(tags, "WATCHDOG=1")) {
log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id);
service_reset_watchdog(s);
if (strv_find(tags, "WATCHDOG=1")) {
log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id);
service_reset_watchdog(s);