X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=586d92fcaf0b1f630fcb16a4a0f2bdfd34ca9433;hb=faf2e887be42215c1999950d16d1975e70bbdfe9;hp=d7fb1bf17001e14daf2b57bc46a27027c305cf15;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index d7fb1bf17..586d92fca 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -24,19 +24,22 @@ #include #include #include -#include -#include #include "sd-daemon.h" #include "strv.h" #include "conf-parser.h" -#include "mkdir.h" #include "bus-util.h" #include "bus-error.h" #include "logind.h" #include "udev-util.h" +#include "formats-util.h" +#include "label.h" +#include "label.h" +#include "cgroup.h" -Manager *manager_new(void) { +static void manager_free(Manager *m); + +static Manager *manager_new(void) { Manager *m; int r; @@ -44,6 +47,8 @@ Manager *manager_new(void) { if (!m) return NULL; + m->pin_cgroupfs_fd = -1; + m->console_active_fd = -1; m->reserve_vt_fd = -1; @@ -57,6 +62,7 @@ Manager *manager_new(void) { m->handle_lid_switch = HANDLE_SUSPEND; m->handle_lid_switch_docked = HANDLE_IGNORE; m->lid_switch_ignore_inhibited = true; + m->holdoff_timeout_usec = 30 * USEC_PER_SEC; m->idle_action_usec = 30 * USEC_PER_MINUTE; m->idle_action = HANDLE_IGNORE; @@ -74,16 +80,21 @@ Manager *manager_new(void) { m->user_units = hashmap_new(&string_hash_ops); m->session_units = hashmap_new(&string_hash_ops); - m->busnames = set_new(&string_hash_ops); + m->running_as = MANAGER_SYSTEM; + m->test_run = false; - if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames || - !m->user_units || !m->session_units) + if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->user_units || !m->session_units) goto fail; m->kill_exclude_users = strv_new("root", NULL); if (!m->kill_exclude_users) goto fail; + /* Make cgroups */ + r = manager_setup_cgroup(m); + if (r < 0) + goto fail; + m->udev = udev_new(); if (!m->udev) goto fail; @@ -101,7 +112,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -139,9 +150,11 @@ void manager_free(Manager *m) { hashmap_free(m->user_units); hashmap_free(m->session_units); - 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->nologin_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); @@ -152,18 +165,16 @@ void manager_free(Manager *m) { safe_close(m->console_active_fd); - if (m->udev_seat_monitor) udev_monitor_unref(m->udev_seat_monitor); - if (m->udev_device_monitor) udev_monitor_unref(m->udev_device_monitor); - if (m->udev_vcsa_monitor) udev_monitor_unref(m->udev_vcsa_monitor); - if (m->udev_button_monitor) udev_monitor_unref(m->udev_button_monitor); - if (m->udev) udev_unref(m->udev); + if (m->unlink_nologin) + unlink("/run/nologin"); + bus_verify_polkit_async_registry_free(m->polkit_registry); sd_bus_unref(m->bus); @@ -171,9 +182,14 @@ void manager_free(Manager *m) { safe_close(m->reserve_vt_fd); + manager_shutdown_cgroup(m, true); + 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); } @@ -290,7 +306,7 @@ static int manager_enumerate_seats(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/seats: %m"); + log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); return -errno; } @@ -327,7 +343,7 @@ static int manager_enumerate_linger_users(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /var/lib/systemd/linger/: %m"); + log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); return -errno; } @@ -363,7 +379,7 @@ static int manager_enumerate_users(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/users: %m"); + log_error_errno(errno, "Failed to open /run/systemd/users: %m"); return -errno; } @@ -404,7 +420,7 @@ static int manager_enumerate_sessions(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/sessions: %m"); + log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); return -errno; } @@ -451,7 +467,7 @@ static int manager_enumerate_inhibitors(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/inhibit: %m"); + log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); return -errno; } @@ -568,7 +584,7 @@ static int manager_reserve_vt(Manager *m) { /* Don't complain on VT-less systems */ if (errno != ENOENT) - log_warning("Failed to pin reserved VT: %m"); + log_warning_errno(errno, "Failed to pin reserved VT: %m"); return -errno; } @@ -583,65 +599,36 @@ static int manager_connect_bus(Manager *m) { assert(!m->bus); r = sd_bus_default_system(&m->bus); - if (r < 0) { - log_error_errno(r, "Failed to connect to system bus: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to connect to system bus: %m"); r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m); - if (r < 0) { - log_error_errno(r, "Failed to add manager object vtable: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add manager object vtable: %m"); r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/seat", "org.freedesktop.login1.Seat", seat_vtable, seat_object_find, m); - if (r < 0) { - log_error_errno(r, "Failed to add seat object vtable: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/seat", seat_node_enumerator, m); - if (r < 0) { - log_error_errno(r, "Failed to add seat enumerator: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat enumerator: %m"); r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m); - if (r < 0) { - log_error_errno(r, "Failed to add session object vtable: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add session object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/session", session_node_enumerator, m); - if (r < 0) { - log_error_errno(r, "Failed to add session enumerator: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add session enumerator: %m"); r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m); - if (r < 0) { - log_error_errno(r, "Failed to add user object vtable: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add user object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/user", user_node_enumerator, m); - if (r < 0) { - log_error_errno(r, "Failed to add user enumerator: %m"); - return r; - } - - r = sd_bus_add_match(m->bus, - NULL, - "type='signal'," - "sender='org.freedesktop.DBus'," - "interface='org.freedesktop.DBus'," - "member='NameOwnerChanged'," - "path='/org/freedesktop/DBus'", - match_name_owner_changed, m); - if (r < 0) { - log_error_errno(r, "Failed to add match for NameOwnerChanged: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add user enumerator: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -651,10 +638,8 @@ static int manager_connect_bus(Manager *m) { "member='JobRemoved'," "path='/org/freedesktop/systemd1'", match_job_removed, m); - if (r < 0) { - log_error_errno(r, "Failed to add match for JobRemoved: %m"); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for JobRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -664,10 +649,8 @@ static int manager_connect_bus(Manager *m) { "member='UnitRemoved'," "path='/org/freedesktop/systemd1'", match_unit_removed, m); - if (r < 0) { - log_error_errno(r, "Failed to add match for UnitRemoved: %m"); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for UnitRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -676,10 +659,8 @@ static int manager_connect_bus(Manager *m) { "interface='org.freedesktop.DBus.Properties'," "member='PropertiesChanged'", match_properties_changed, m); - if (r < 0) { - log_error_errno(r, "Failed to add match for PropertiesChanged: %m"); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for PropertiesChanged: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -689,10 +670,8 @@ static int manager_connect_bus(Manager *m) { "member='Reloading'," "path='/org/freedesktop/systemd1'", match_reloading, m); - if (r < 0) { - log_error_errno(r, "Failed to add match for Reloading: %m"); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for Reloading: %m"); r = sd_bus_call_method( m->bus, @@ -702,22 +681,16 @@ static int manager_connect_bus(Manager *m) { "Subscribe", &error, NULL, NULL); - if (r < 0) { - log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + log_notice("Failed to enable subscription: %s", bus_error_message(&error, r)); r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); - if (r < 0) { - log_error_errno(r, "Failed to register name: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); r = sd_bus_attach_event(m->bus, m->event, 0); - if (r < 0) { - log_error_errno(r, "Failed to attach bus to event loop: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); return 0; } @@ -783,7 +756,7 @@ static int manager_connect_console(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /sys/class/tty/tty0/active: %m"); + log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); return -errno; } @@ -806,16 +779,12 @@ static int manager_connect_console(Manager *m) { } r = ignore_signals(SIGRTMIN + 1, -1); - if (r < 0) { - log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m"); r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1); - if (r < 0) { - log_error_errno(r, "Cannot block SIGRTMIN: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Cannot block SIGRTMIN: %m"); r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m); if (r < 0) @@ -924,7 +893,7 @@ static int manager_connect_udev(Manager *m) { 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; @@ -950,8 +919,8 @@ void manager_gc(Manager *m, bool drop_not_started) { session_get_state(session) != SESSION_CLOSING) session_stop(session, false); - /* Normally, this should make the session busy again, - * if it doesn't then let's get rid of it + /* Normally, this should make the session referenced + * again, if it doesn't then let's get rid of it * immediately */ if (!session_check_gc(session, drop_not_started)) { session_finalize(session); @@ -1016,34 +985,26 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us CLOCK_MONOTONIC, elapse, USEC_PER_SEC*30, manager_dispatch_idle_action, m); - if (r < 0) { - log_error_errno(r, "Failed to add idle event source: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add idle event source: %m"); r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); - if (r < 0) { - log_error_errno(r, "Failed to set idle event source priority: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to set idle event source priority: %m"); } else { r = sd_event_source_set_time(m->idle_action_event_source, elapse); - if (r < 0) { - log_error_errno(r, "Failed to set idle event timer: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to set idle event timer: %m"); r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT); - if (r < 0) { - log_error_errno(r, "Failed to enable idle event timer: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to enable idle event timer: %m"); } return 0; } -int manager_startup(Manager *m) { +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; @@ -1061,10 +1022,8 @@ int manager_startup(Manager *m) { /* Connect to udev */ r = manager_connect_udev(m); - if (r < 0) { - log_error_errno(r, "Failed to create udev watchers: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to create udev watchers: %m"); /* Connect to the bus */ r = manager_connect_bus(m); @@ -1073,12 +1032,10 @@ int manager_startup(Manager *m) { /* Instantiate magic seat 0 */ r = manager_add_seat(m, "seat0", &m->seat0); - if (r < 0) { - log_error_errno(r, "Failed to add seat0: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat0: %m"); - r = manager_set_lid_switch_ignore(m, 0 + IGNORE_LID_SWITCH_STARTUP_USEC); + r = manager_set_lid_switch_ignore(m, 0 + m->holdoff_timeout_usec); if (r < 0) log_warning_errno(r, "Failed to set up lid switch ignore event source: %m"); @@ -1134,14 +1091,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; @@ -1150,19 +1105,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; } @@ -1200,9 +1143,21 @@ 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/seats", 0755); - mkdir_label("/run/systemd/users", 0755); - mkdir_label("/run/systemd/sessions", 0755); + r = mkdir_label("/run/systemd", 0755); + if ( (r < 0) && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd : %m"); + r = mkdir_label("/run/systemd/seats", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/seats : %m"); + r = mkdir_label("/run/systemd/users", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/users : %m"); + r = mkdir_label("/run/systemd/sessions", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/sessions : %m"); + r = mkdir_label("/run/systemd/machines", 0755); + if ( r < 0 && (-EEXIST != r) ) + return log_error_errno(r, "Failed to create /run/systemd/machines : %m"); m = manager_new(); if (!m) { @@ -1218,7 +1173,7 @@ int main(int argc, char *argv[]) { goto finish; } - log_debug("systemd-logind running as pid "PID_FMT, getpid()); + log_debug("logind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1226,14 +1181,13 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("systemd-logind stopped as pid "PID_FMT, getpid()); + log_debug("logind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false, "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;