chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rename unit_destroy_cgroup() to unit_destroy_cgroup_if_empty() since it's not...
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index 9db773b3998a27ec0f1ab69a727c0887688c16f2..bfbe959edbbc7f81a6ac64b0ea51e6b1678c0ff6 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-546,13
+546,6
@@
static void service_dump(Unit *u, FILE *f, const char *prefix) {
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
-#ifdef HAVE_SYSV_COMPAT
- if (s->sysv_start_priority >= 0)
- fprintf(f,
- "%sSysVStartPriority: %i\n",
- prefix, s->sysv_start_priority);
-#endif
-
if (s->status_text)
fprintf(f, "%sStatus Text: %s\n",
prefix, s->status_text);
if (s->status_text)
fprintf(f, "%sStatus Text: %s\n",
prefix, s->status_text);
@@
-710,7
+703,7
@@
static void service_set_state(Service *s, ServiceState state) {
/* For the inactive states unit_notify() will trim the cgroup,
* but for exit we have to do that ourselves... */
if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
/* For the inactive states unit_notify() will trim the cgroup,
* but for exit we have to do that ourselves... */
if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
- unit_destroy_cgroup(UNIT(s));
+ unit_destroy_cgroup
_if_empty
(UNIT(s));
/* For remain_after_exit services, let's see if we can "release" the
* hold on the console, since unit_notify() only does that in case of
/* For remain_after_exit services, let's see if we can "release" the
* hold on the console, since unit_notify() only does that in case of