summaryrefslogtreecommitdiff
path: root/src/manager.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-02-02 12:39:33 +0100
committerMichal Schmidt <mschmidt@redhat.com>2012-02-02 13:39:15 +0100
commitbacbccb78cec45c4759ef4291375605284248eb0 (patch)
treeaf02ed86ec4368b43f3cac697db515f7774f7fe8 /src/manager.c
parent9f056f4087b9b0c88decc33c32078f8503efa46e (diff)
manager: tell correctly if the manager is booting
The assumption that the initial job is the job with id==1 is incorrect. Some jobs may be enqueued before the job that starts the default unit as in this example: -.mount changed dead -> mounted Trying to enqueue job quotacheck.service/start/fail Installed new job quotacheck.service/start as 1 Installed new job systemd-stdout-syslog-bridge.socket/start as 2 Enqueued job quotacheck.service/start as 1 Trying to enqueue job quotaon.service/start/fail Installed new job quotaon.service/start as 5 Enqueued job quotaon.service/start as 5 Activating default unit: default.target Trying to enqueue job graphical.target/start/replace This fixes a bug where displaying of boot status messages was turned off too early.
Diffstat (limited to 'src/manager.c')
-rw-r--r--src/manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/manager.c b/src/manager.c
index 19e5441722..74bd740747 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -2943,7 +2943,7 @@ bool manager_is_booting_or_shutting_down(Manager *m) {
assert(m);
/* Is the initial job still around? */
- if (manager_get_job(m, 1))
+ if (manager_get_job(m, m->default_unit_job_id))
return true;
/* Is there a job for the shutdown target? */