shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-10 00:58:20 +03:00
Code

Fix RemainAfterExit services keeping a hold on console

Browse Source 
When a service exits succesfully and has RemainAfterExit set, its hold
on the console (in m->n_on_console) wasn't released since the unit state
didn't change.
This commit is contained in:
Olivier Brunel 2013-11-14 15:52:54 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent ad929fe196
commit 9cd861842c
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -21,8 +21,6 @@ Bugfixes:
Cannot add dependency job for unit display-manager.service, ignoring: Unit display-manager.service failed to load: No such file or directory. See system logs and 'systemctl status display-manager.service' for details.
* Substract units in SERVICE_EXITED substate from n_on_console.
Fedora 20:
* external: ps should gain colums for slice and machine

16
src/core/service.c
View File

@ -1519,6 +1519,22 @@ static void service_set_state(Service *s, ServiceState state) {
if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
unit_destroy_cgroup(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
* change of state */
if (state == SERVICE_EXITED && s->remain_after_exit &&
UNIT(s)->manager->n_on_console > 0) {
ExecContext *ec = unit_get_exec_context(UNIT(s));
if (ec && exec_context_may_touch_console(ec)) {
Manager *m = UNIT(s)->manager;
m->n_on_console --;
if (m->n_on_console == 0)
/* unset no_console_output flag, since the console is free */
m->no_console_output = false;
}
}
if (old_state != state)
log_debug_unit(UNIT(s)->id,
"%s changed %s -> %s", UNIT(s)->id,

3
src/core/unit.c
View File

@ -1490,6 +1490,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
unit_destroy_cgroup(u);
/* Note that this doesn't apply to RemainAfterExit services exiting
* sucessfully, since there's no change of state in that case. Which is
* why it is handled in service_set_state() */
if (UNIT_IS_INACTIVE_OR_FAILED(os) != UNIT_IS_INACTIVE_OR_FAILED(ns)) {
ExecContext *ec = unit_get_exec_context(u);
if (ec && exec_context_may_touch_console(ec)) {