X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=d427d88d4e5a111495ab719da3c56d2800f8e7ea;hb=45071fcaa03eafc27352987fa2277b2792725036;hp=70917891b9f86f20309f929ec37f0b54fa1af0ca;hpb=fa1b91632c5220e6589007af4cd573ca909f915a;p=elogind.git diff --git a/src/core/manager.c b/src/core/manager.c index 70917891b..d427d88d4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -192,7 +194,7 @@ static void manager_print_jobs_in_progress(Manager *m) { if (job_get_timeout(j, &x) > 0) format_timespan(limit, sizeof(limit), x - j->begin_usec, 1*USEC_PER_SEC); - manager_status_printf(m, true, cylon, + manager_status_printf(m, STATUS_TYPE_EPHEMERAL, cylon, "%sA %s job is running for %s (%s / %s)", strempty(job_of_n), job_type_to_string(j->type), @@ -201,6 +203,96 @@ static void manager_print_jobs_in_progress(Manager *m) { } +static int have_ask_password(void) { + _cleanup_closedir_ DIR *dir; + + dir = opendir("/run/systemd/ask-password"); + if (!dir) { + if (errno == ENOENT) + return false; + else + return -errno; + } + + for (;;) { + struct dirent *de; + + errno = 0; + de = readdir(dir); + if (!de && errno != 0) + return -errno; + if (!de) + return false; + + if (startswith(de->d_name, "ask.")) + return true; + } +} + +static int manager_dispatch_ask_password_fd(sd_event_source *source, + int fd, uint32_t revents, void *userdata) { + Manager *m = userdata; + + assert(m); + + flush_fd(fd); + + m->have_ask_password = have_ask_password(); + if (m->have_ask_password < 0) + /* Log error but continue. Negative have_ask_password + * is treated as unknown status. */ + log_error("Failed to list /run/systemd/ask-password: %s", strerror(m->have_ask_password)); + + return 0; +} + +static void manager_close_ask_password(Manager *m) { + assert(m); + + m->ask_password_inotify_fd = safe_close(m->ask_password_inotify_fd); + m->ask_password_event_source = sd_event_source_unref(m->ask_password_event_source); + m->have_ask_password = -EINVAL; +} + +static int manager_check_ask_password(Manager *m) { + int r; + + assert(m); + + if (!m->ask_password_event_source) { + assert(m->ask_password_inotify_fd < 0); + + mkdir_p_label("/run/systemd/ask-password", 0755); + + m->ask_password_inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC); + if (m->ask_password_inotify_fd < 0) { + log_error("inotify_init1() failed: %m"); + return -errno; + } + + if (inotify_add_watch(m->ask_password_inotify_fd, "/run/systemd/ask-password", IN_CREATE|IN_DELETE|IN_MOVE) < 0) { + log_error("Failed to add watch on /run/systemd/ask-password: %m"); + manager_close_ask_password(m); + return -errno; + } + + r = sd_event_add_io(m->event, &m->ask_password_event_source, + m->ask_password_inotify_fd, EPOLLIN, + manager_dispatch_ask_password_fd, m); + if (r < 0) { + log_error("Failed to add event source for /run/systemd/ask-password: %m"); + manager_close_ask_password(m); + return -errno; + } + + /* Queries might have been added meanwhile... */ + manager_dispatch_ask_password_fd(m->ask_password_event_source, + m->ask_password_inotify_fd, EPOLLIN, m); + } + + return m->have_ask_password; +} + static int manager_watch_idle_pipe(Manager *m) { int r; @@ -465,6 +557,9 @@ int manager_new(SystemdRunningAs running_as, bool test_run, Manager **_m) { m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd = m->dev_autofs_fd = m->private_listen_fd = m->kdbus_fd = -1; m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */ + m->ask_password_inotify_fd = -1; + m->have_ask_password = -EINVAL; /* we don't know */ + m->test_run = test_run; r = manager_default_environment(m); @@ -859,6 +954,8 @@ void manager_free(Manager *m) { safe_close(m->time_change_fd); safe_close(m->kdbus_fd); + manager_close_ask_password(m); + manager_close_idle_pipe(m); udev_unref(m->udev); @@ -2515,6 +2612,9 @@ void manager_check_finished(Manager *m) { /* Turn off confirm spawn now */ m->confirm_spawn = false; + /* No need to update ask password status when we're going non-interactive */ + manager_close_ask_password(m); + /* This is no longer the first boot */ manager_set_first_boot(m, false); @@ -2831,7 +2931,7 @@ void manager_set_show_status(Manager *m, ShowStatus mode) { unlink("/run/systemd/show-status"); } -static bool manager_get_show_status(Manager *m) { +static bool manager_get_show_status(Manager *m, StatusType type) { assert(m); if (m->running_as != SYSTEMD_SYSTEM) @@ -2843,12 +2943,15 @@ static bool manager_get_show_status(Manager *m) { if (!IN_SET(manager_state(m), MANAGER_INITIALIZING, MANAGER_STARTING, MANAGER_STOPPING)) return false; + /* If we cannot find out the status properly, just proceed. */ + if (type != STATUS_TYPE_EMERGENCY && manager_check_ask_password(m) > 0) + return false; + if (m->show_status > 0) 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(); } @@ -2866,19 +2969,19 @@ void manager_set_first_boot(Manager *m, bool b) { unlink("/run/systemd/first-boot"); } -void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) { +void manager_status_printf(Manager *m, StatusType type, const char *status, const char *format, ...) { va_list ap; - if (!manager_get_show_status(m)) + if (!manager_get_show_status(m, type)) return; /* XXX We should totally drop the check for ephemeral here * and thus effectively make 'Type=idle' pointless. */ - if (ephemeral && m->n_on_console > 0) + if (type == STATUS_TYPE_EPHEMERAL && m->n_on_console > 0) return; va_start(ap, format); - status_vprintf(status, true, ephemeral, format, ap); + status_vprintf(status, true, type == STATUS_TYPE_EPHEMERAL, format, ap); va_end(ap); }