diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-09-01 21:05:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-09-01 21:05:06 +0200 |
| commit | 27d340c772fb1b251085dba7bd5420484f7c5892 (patch) | |
| tree | 40444adbc2ac122fa9ebfbe3d471f8a7f0864725 /src/manager.c | |
| parent | fe7ac310219d84ca8621fd89b99fcf60a2fdfd46 (diff) | |
fsck: show progress while fscking at boot
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/manager.c b/src/manager.c index 163f69c22f..6311c10361 100644 --- a/src/manager.c +++ b/src/manager.c @@ -2248,12 +2248,12 @@ static int manager_process_signal_fd(Manager *m) { case 20: log_debug("Enabling showing of status."); - m->show_status = true; + manager_set_show_status(m, true); break; case 21: log_debug("Disabling showing of status."); - m->show_status = false; + manager_set_show_status(m, false); break; case 22: @@ -2904,7 +2904,8 @@ bool manager_is_booting_or_shutting_down(Manager *m) { return true; /* Is there a job for the shutdown target? */ - if (((u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET)))) + u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET); + if (u) return !!u->meta.job; return false; @@ -3134,6 +3135,35 @@ void manager_recheck_syslog(Manager *m) { log_open(); } +void manager_set_show_status(Manager *m, bool b) { + assert(m); + + if (m->running_as != MANAGER_SYSTEM) + return; + + m->show_status = b; + + if (b) + touch("/run/systemd/show-status"); + else + unlink("/run/systemd/show-status"); +} + +bool manager_get_show_status(Manager *m) { + assert(m); + + if (m->running_as != MANAGER_SYSTEM) + return false; + + if (m->show_status) + return true; + + /* If Plymouth is running make sure we show the status, so + * that there's something nice to see when people press Esc */ + + return plymouth_running(); +} + static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = { [MANAGER_SYSTEM] = "system", [MANAGER_USER] = "user" |