X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=0d96bbdaa93e4656129252ed32503abdedbbfdf0;hp=845a229230fdf4f51bec4177681c530fc9285709;hb=4a91795b56e8e4358f7463f40b45ee4ee593d99c;hpb=16e56d9f1ae28f17cf360a6daaab668b6cd66e61 diff --git a/src/login/logind.c b/src/login/logind.c index 845a22923..0d96bbdaa 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -32,8 +32,11 @@ #include "bus-error.h" #include "logind.h" #include "udev-util.h" +#include "formats-util.h" -Manager *manager_new(void) { +static void manager_free(Manager *m); + +static Manager *manager_new(void) { Manager *m; int r; @@ -42,7 +45,10 @@ Manager *manager_new(void) { return NULL; m->console_active_fd = -1; + m->reserve_vt_fd = -1; + m->n_autovts = 6; + m->reserve_vt = 6; m->remove_ipc = true; m->inhibit_delay_max = 5 * USEC_PER_SEC; m->handle_power_key = HANDLE_POWEROFF; @@ -96,7 +102,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -137,6 +143,9 @@ void manager_free(Manager *m) { set_free_free(m->busnames); sd_event_source_unref(m->idle_action_event_source); + sd_event_source_unref(m->inhibit_timeout_source); + sd_event_source_unref(m->scheduled_shutdown_timeout_source); + sd_event_source_unref(m->wall_message_timeout_source); sd_event_source_unref(m->console_active_event_source); sd_event_source_unref(m->udev_seat_event_source); @@ -164,9 +173,14 @@ void manager_free(Manager *m) { sd_bus_unref(m->bus); sd_event_unref(m->event); + safe_close(m->reserve_vt_fd); + strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); + free(m->scheduled_shutdown_type); + free(m->scheduled_shutdown_tty); + free(m->wall_message); free(m->action_job); free(m); } @@ -545,6 +559,29 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } +static int manager_reserve_vt(Manager *m) { + _cleanup_free_ char *p = NULL; + + assert(m); + + if (m->reserve_vt <= 0) + return 0; + + if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0) + return log_oom(); + + m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); + if (m->reserve_vt_fd < 0) { + + /* Don't complain on VT-less systems */ + if (errno != ENOENT) + log_warning_errno(errno, "Failed to pin reserved VT: %m"); + return -errno; + } + + return 0; +} + static int manager_connect_bus(Manager *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; @@ -647,8 +684,8 @@ static int manager_connect_bus(Manager *m) { &error, NULL, NULL); if (r < 0) { - log_warning("Failed to subscribe to org.freedesktop.systemd1.Manager: %s", - bus_error_message(&error, r)); + log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); + return r; } r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); @@ -837,10 +874,30 @@ static int manager_connect_udev(Manager *m) { return r; } + /* Don't bother watching VCSA devices, if nobody cares */ + if (m->n_autovts > 0 && m->console_active_fd >= 0) { + + m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); + if (!m->udev_vcsa_monitor) + return -ENOMEM; + + r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_vcsa_monitor, "vc", NULL); + if (r < 0) + return r; + + r = udev_monitor_enable_receiving(m->udev_vcsa_monitor); + if (r < 0) + return r; + + r = sd_event_add_io(m->event, &m->udev_vcsa_event_source, udev_monitor_get_fd(m->udev_vcsa_monitor), EPOLLIN, manager_dispatch_vcsa_udev, m); + if (r < 0) + return r; + } + return 0; } -void manager_gc(Manager *m, bool drop_not_started) { +static void manager_gc(Manager *m, bool drop_not_started) { Seat *seat; Session *session; User *user; @@ -951,7 +1008,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us return 0; } -int manager_startup(Manager *m) { +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; @@ -1014,6 +1071,9 @@ int manager_startup(Manager *m) { /* Remove stale objects before we start them */ manager_gc(m, false); + /* Reserve the special reserved VT */ + manager_reserve_vt(m); + /* And start everything */ HASHMAP_FOREACH(seat, m->seats, i) seat_start(seat); @@ -1035,14 +1095,12 @@ int manager_startup(Manager *m) { return 0; } -int manager_run(Manager *m) { +static int manager_run(Manager *m) { int r; assert(m); for (;;) { - usec_t us = (uint64_t) -1; - r = sd_event_get_state(m->event); if (r < 0) return r; @@ -1051,19 +1109,7 @@ int manager_run(Manager *m) { manager_gc(m, true); - if (manager_dispatch_delayed(m) > 0) - continue; - - if (m->action_what != 0 && !m->action_job) { - usec_t x, y; - - x = now(CLOCK_MONOTONIC); - y = m->action_timestamp + m->inhibit_delay_max; - - us = x >= y ? 0 : y - x; - } - - r = sd_event_run(m->event, us); + r = sd_event_run(m->event, (uint64_t) -1); if (r < 0) return r; } @@ -1101,7 +1147,6 @@ int main(int argc, char *argv[]) { * existence of /run/systemd/seats/ to determine whether * logind is available, so please always make sure this check * stays in. */ - mkdir_label("/run/systemd", 0755); mkdir_label("/run/systemd/seats", 0755); mkdir_label("/run/systemd/users", 0755); mkdir_label("/run/systemd/sessions", 0755); @@ -1120,7 +1165,7 @@ int main(int argc, char *argv[]) { goto finish; } - log_debug("logind running as pid "PID_FMT, getpid()); + log_debug("systemd-logind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1128,7 +1173,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("logind stopped as pid "PID_FMT, getpid()); + log_debug("systemd-logind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false,