picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

manager: use system state enum where appropriate

Browse source
This commit is contained in:
Lennart Poettering 2014-03-12 22:27:13 +01:00
parent dc36d78e11
commit 0851062751
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/manager.c
View file

@ -2414,23 +2414,6 @@ int manager_reload(Manager *m) {
return r;
}
static bool manager_is_booting_or_shutting_down(Manager *m) {
Unit *u;
assert(m);
/* Is the initial job still around? */
if (manager_get_job(m, m->default_unit_job_id))
return true;
/* Is there a job for the shutdown target? */
u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET);
if (u)
return !!u->job;
return false;
}
bool manager_is_reloading_or_reexecuting(Manager *m) {
assert(m);
@ -2804,6 +2787,9 @@ static bool manager_get_show_status(Manager *m) {
if (m->no_console_output)
return false;
if (!IN_SET(manager_state(m), MANAGER_STARTING, MANAGER_STOPPING))
return false;
if (m->show_status > 0)
return true;
@ -2824,9 +2810,6 @@ void manager_status_printf(Manager *m, bool ephemeral, const char *status, const
if (ephemeral && m->n_on_console > 0)
return;
if (!manager_is_booting_or_shutting_down(m))
return;
va_start(ap, format);
status_vprintf(status, true, ephemeral, format, ap);
va_end(ap);