summaryrefslogtreecommitdiff
path: root/src/core/manager.c
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2016-11-15 09:29:04 +0100
committerFranck Bui <fbui@suse.com>2016-11-17 18:16:50 +0100
commitb0eb29449e63799f8b6b3440cd865d51b90a5423 (patch)
tree173f8c1d694651032ffa63785de55e5645baac3b /src/core/manager.c
parent56fde33af1101bd7d01f1f8b2472d37ab04490c6 (diff)
core: add 'c' in confirmation_spawn to resume the boot process
Diffstat (limited to 'src/core/manager.c')
-rw-r--r--src/core/manager.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 6ffbbd7389..b49e3b593a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -114,7 +114,7 @@ static void manager_watch_jobs_in_progress(Manager *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)
+ if (!manager_is_confirm_spawn_disabled(m))
return;
if (m->jobs_in_progress_event_source)
@@ -3218,6 +3218,17 @@ void manager_set_first_boot(Manager *m, bool b) {
m->first_boot = b;
}
+void manager_disable_confirm_spawn(void) {
+ (void) touch("/run/systemd/confirm_spawn_disabled");
+}
+
+bool manager_is_confirm_spawn_disabled(Manager *m) {
+ if (!m->confirm_spawn)
+ return true;
+
+ return access("/run/systemd/confirm_spawn_disabled", F_OK) >= 0;
+}
+
void manager_status_printf(Manager *m, StatusType type, const char *status, const char *format, ...) {
va_list ap;