diff options
author | Franck Bui <fbui@suse.com> | 2016-11-02 10:50:20 +0100 |
---|---|---|
committer | Franck Bui <fbui@suse.com> | 2016-11-17 18:11:21 +0100 |
commit | 42bf1ae17bad7fafc4ee8e7b6a3052da6decb9f7 (patch) | |
tree | 54f25fcbc866f41429f9a873b632b64115566268 /src | |
parent | f80da6f3e9913cec4febcf35536b6b98cfa9d33a (diff) |
core: prevent the cylon when confirmation_spawn=yes (#2194)
When booting with systemd.confirm_spawn=true, the eye of cylon
animation kicks in pretty quickly so user doesn't have any chance to
answer the questions which services to start before the confirmation
message is screwed by the cylon.
This basically breaks the confirm_spawn functionality completely.
This patch prevents the cylon animation to kick in when
confirmation_spawn=yes.
Fixes: #2194
Diffstat (limited to 'src')
-rw-r--r-- | src/core/manager.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 52174eac07..d9f772d168 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -111,6 +111,12 @@ static void manager_watch_jobs_in_progress(Manager *m) { assert(m); + /* We do not want to show the cylon animation if the user + * needs to confirm service executions otherwise confirmation + * messages will be screwed by the cylon animation. */ + if (m->confirm_spawn) + return; + if (m->jobs_in_progress_event_source) return; |