X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=e22f68d23761ba31adac1eeef23b5c8105a2ca04;hp=1eb745adcecfafb9166ca506bb75da5a26cc6a52;hb=12a1309e117972791a84f20483e981a42be0d9ac;hpb=cdc564d27f71f82457e96e9b237564fc6e8e84c9 diff --git a/src/login/logind.c b/src/login/logind.c index 1eb745adc..e22f68d23 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -50,12 +50,15 @@ Manager *manager_new(void) { m->udev_vcsa_fd = -1; m->udev_button_fd = -1; m->epoll_fd = -1; + m->reserve_vt_fd = -1; m->n_autovts = 6; + m->reserve_vt = 6; m->inhibit_delay_max = 5 * USEC_PER_SEC; - m->handle_power_key = HANDLE_NO_SESSION; - m->handle_sleep_key = HANDLE_TTY_SESSION; - m->handle_lid_switch = HANDLE_OFF; + m->handle_power_key = HANDLE_POWEROFF; + m->handle_sleep_key = HANDLE_SUSPEND; + m->handle_lid_switch = HANDLE_SUSPEND; + m->lid_switch_ignore_inhibited = true; m->devices = hashmap_new(string_hash_func, string_compare_func); m->seats = hashmap_new(string_hash_func, string_compare_func); @@ -166,6 +169,9 @@ void manager_free(Manager *m) { if (m->epoll_fd >= 0) close_nointr_nofail(m->epoll_fd); + if (m->reserve_vt_fd >= 0) + close_nointr_nofail(m->reserve_vt_fd); + strv_free(m->controllers); strv_free(m->reset_controllers); strv_free(m->kill_only_users); @@ -279,7 +285,7 @@ int manager_add_user_by_name(Manager *m, const char *name, User **_user) { assert(m); assert(name); - r = get_user_creds(&name, &uid, &gid, NULL); + r = get_user_creds(&name, &uid, &gid, NULL, NULL); if (r < 0) return r; @@ -489,9 +495,9 @@ int manager_enumerate_buttons(Manager *m) { /* Loads buttons from udev */ - if (m->handle_power_key == HANDLE_OFF && - m->handle_sleep_key == HANDLE_OFF && - m->handle_lid_switch == HANDLE_OFF) + if (m->handle_power_key == HANDLE_IGNORE && + m->handle_sleep_key == HANDLE_IGNORE && + m->handle_lid_switch == HANDLE_IGNORE) return 0; e = udev_enumerate_new(m->udev); @@ -942,30 +948,26 @@ static int vt_is_busy(int vtnr) { int manager_spawn_autovt(Manager *m, int vtnr) { int r; - DBusMessage *message = NULL, *reply = NULL; char *name = NULL; const char *mode = "fail"; - DBusError error; assert(m); assert(vtnr >= 1); - dbus_error_init(&error); - - if ((unsigned) vtnr > m->n_autovts) + if ((unsigned) vtnr > m->n_autovts && + (unsigned) vtnr != m->reserve_vt) return 0; - r = vt_is_busy(vtnr); - if (r < 0) - return r; - else if (r > 0) - return -EBUSY; + if ((unsigned) vtnr != m->reserve_vt) { + /* If this is the reserved TTY, we'll start the getty + * on it in any case, but otherwise only if it is not + * busy. */ - message = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"); - if (!message) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; + r = vt_is_busy(vtnr); + if (r < 0) + return r; + else if (r > 0) + return -EBUSY; } if (asprintf(&name, "autovt@tty%i.service", vtnr) < 0) { @@ -974,35 +976,45 @@ int manager_spawn_autovt(Manager *m, int vtnr) { goto finish; } - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not attach target and flag information to message."); - r = -ENOMEM; - goto finish; - } - - reply = dbus_connection_send_with_reply_and_block(m->bus, message, -1, &error); - if (!reply) { - log_error("Failed to start unit: %s", bus_error_message(&error)); - goto finish; - } - - r = 0; + r = bus_method_call_with_reply ( + m->bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "StartUnit", + NULL, + NULL, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &mode, + DBUS_TYPE_INVALID); finish: free(name); - if (message) - dbus_message_unref(message); + return r; +} - if (reply) - dbus_message_unref(reply); +static int manager_reserve_vt(Manager *m) { + _cleanup_free_ char *p = NULL; - dbus_error_free(&error); + assert(m); - return r; + 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("Failed to pin reserved VT: %m"); + return -errno; + } + + return 0; } int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) { @@ -1020,10 +1032,8 @@ int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **sess } p = strdup(cgroup); - if (!p) { - log_error("Out of memory."); - return -ENOMEM; - } + if (!p) + return log_oom(); for (;;) { char *e; @@ -1061,10 +1071,8 @@ int manager_get_user_by_cgroup(Manager *m, const char *cgroup, User **user) { } p = strdup(cgroup); - if (!p) { - log_error("Out of memory."); - return -ENOMEM; - } + if (!p) + return log_oom(); for (;;) { char *e; @@ -1176,8 +1184,7 @@ static int manager_connect_bus(Manager *m) { !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/session", &bus_session_vtable, m) || !dbus_connection_register_fallback(m->bus, "/org/freedesktop/login1/user", &bus_user_vtable, m) || !dbus_connection_add_filter(m->bus, bus_message_filter, m, NULL)) { - log_error("Not enough memory"); - r = -ENOMEM; + r = log_oom(); goto fail; } @@ -1298,9 +1305,9 @@ static int manager_connect_udev(Manager *m) { return -errno; /* Don't watch keys if nobody cares */ - if (m->handle_power_key != HANDLE_OFF || - m->handle_sleep_key != HANDLE_OFF || - m->handle_lid_switch != HANDLE_OFF) { + if (m->handle_power_key != HANDLE_IGNORE || + m->handle_sleep_key != HANDLE_IGNORE || + m->handle_lid_switch != HANDLE_IGNORE) { m->udev_button_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); if (!m->udev_button_monitor) @@ -1400,7 +1407,7 @@ int manager_get_idle_hint(Manager *m, dual_timestamp *t) { assert(m); - idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t); + idle_hint = !manager_is_inhibited(m, INHIBIT_IDLE, INHIBIT_BLOCK, t, false); HASHMAP_FOREACH(s, m->sessions, i) { dual_timestamp k; @@ -1480,6 +1487,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); @@ -1611,8 +1621,7 @@ int main(int argc, char *argv[]) { m = manager_new(); if (!m) { - log_error("Out of memory"); - r = -ENOMEM; + r = log_oom(); goto finish; }