diff options
| author | Olivier Brunel <jjk@jjacky.com> | 2013-09-20 22:18:29 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-11-13 23:22:31 -0500 |
| commit | 2f38577f3040eedebfe1ace05d5b5a779a588af1 (patch) | |
| tree | 5da2fb1f10c4e10e6cfec0a7641e6a61bf81f080 /src/core | |
| parent | 8aa5429a4a59abbcf567938fa6ef60bb2c8ae2f1 (diff) | |
Only disable output on console during boot if needed
If there are no more jobs on console, no need/we shouldn't disable output.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/core/unit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 07ca4c92f7..c99a022cd5 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1789,7 +1789,7 @@ static int process_event(Manager *m, struct epoll_event *ev) { } case WATCH_IDLE_PIPE: { - m->no_console_output = true; + m->no_console_output = m->n_on_console > 0; manager_unwatch_idle_pipe(m); close_idle_pipe(m); diff --git a/src/core/unit.c b/src/core/unit.c index 201329fc86..15e0a82020 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1492,7 +1492,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su if (m->n_on_console == 0) /* unset no_console_output flag, since the console is free */ - m->no_console_output = 0; + m->no_console_output = false; } else m->n_on_console ++; } |