X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=5da76a76754ec76e6aeac89910766c9fa6b3e3aa;hb=bf2098e9e4837573d84dd4949b9c28a7372c93b9;hp=cd0b67119b45b6114fdf1709c0bd55136ed7d297;hpb=ebbac6d948b9d323b3d57bfd7c3513776e591dc1;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index cd0b67119..5da76a767 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -30,11 +30,17 @@ #include "conf-parser.h" #include "bus-util.h" #include "bus-error.h" -#include "udev-util.h" -#include "signal-util.h" #include "logind.h" +#include "udev-util.h" +#include "formats-util.h" +#include "label.h" +#include "label.h" +#include "cgroup.h" +#include "virt.h" + +static void manager_free(Manager *m); -Manager *manager_new(void) { +static Manager *manager_new(void) { Manager *m; int r; @@ -42,8 +48,17 @@ Manager *manager_new(void) { if (!m) return NULL; + m->pin_cgroupfs_fd = -1; + m->console_active_fd = -1; +/// elogind does not support autospawning of vts +#if 0 + m->reserve_vt_fd = -1; + + m->n_autovts = 6; + m->reserve_vt = 6; +#endif // 0 m->remove_ipc = true; m->inhibit_delay_max = 5 * USEC_PER_SEC; m->handle_power_key = HANDLE_POWEROFF; @@ -67,15 +82,41 @@ Manager *manager_new(void) { m->inhibitors = hashmap_new(&string_hash_ops); m->buttons = hashmap_new(&string_hash_ops); - m->busnames = set_new(&string_hash_ops); + m->user_units = hashmap_new(&string_hash_ops); + m->session_units = hashmap_new(&string_hash_ops); - if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames) + m->running_as = MANAGER_SYSTEM; + m->test_run = false; + + 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->suspend_mode = NULL; + m->suspend_state = strv_new("mem", "standby", "freeze", NULL); + if (!m->suspend_state) + goto fail; + m->hibernate_mode = strv_new("platform", "shutdown", NULL); + if (!m->hibernate_mode) + goto fail; + m->hibernate_state = strv_new("disk", NULL); + if (!m->hibernate_state) + goto fail; + m->hybrid_sleep_mode = strv_new("suspend", "platform", "shutdown", NULL); + if (!m->hybrid_sleep_mode) + goto fail; + m->hybrid_sleep_state = strv_new("disk", NULL); + if (!m->hybrid_sleep_state) + goto fail; + m->udev = udev_new(); if (!m->udev) goto fail; @@ -93,7 +134,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -128,9 +169,14 @@ void manager_free(Manager *m) { hashmap_free(m->inhibitors); hashmap_free(m->buttons); - set_free_free(m->busnames); + hashmap_free(m->user_units); + hashmap_free(m->session_units); 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); @@ -141,26 +187,48 @@ 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); sd_event_unref(m->event); +/// elogind does not support autospawning of vts +#if 0 + safe_close(m->reserve_vt_fd); +#endif // 0 + + /* Avoid the creation of new processes forked by the + * kernel; at this point, we will not listen to the + * signals anyway */ + if (detect_container(NULL) <= 0) + (void) cg_uninstall_release_agent(ELOGIND_CGROUP_CONTROLLER); + + 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); + + strv_free(m->suspend_mode); + strv_free(m->suspend_state); + strv_free(m->hibernate_mode); + strv_free(m->hibernate_state); + strv_free(m->hybrid_sleep_mode); + strv_free(m->hybrid_sleep_state); + free(m); } @@ -491,6 +559,8 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev return 0; } +/// UNNEEDED by elogind +#if 0 static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_udev_device_unref_ struct udev_device *d = NULL; Manager *m = userdata; @@ -512,6 +582,7 @@ static int manager_dispatch_vcsa_udev(sd_event_source *s, int fd, uint32_t reven return 0; } +#endif // 0 static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_udev_device_unref_ struct udev_device *d = NULL; @@ -538,34 +609,31 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } -static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - Session *s; - const char *cgroup; - int r; +/// UNNEEDED by elogind +#if 0 +static int manager_reserve_vt(Manager *m) { + _cleanup_free_ char *p = NULL; - assert(bus); - assert(message); assert(m); - r = sd_bus_message_read(message, "s", &cgroup); - if (r < 0) { - bus_log_parse_error(r); + if (m->reserve_vt <= 0) return 0; - } - s = hashmap_get(m->sessions, cgroup); + if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0) + return log_oom(); - if (!s) { - log_warning("Session not found: %s", cgroup); - return 0; - } + m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); + if (m->reserve_vt_fd < 0) { - session_finalize(s); - session_free(s); + /* Don't complain on VT-less systems */ + if (errno != ENOENT) + log_warning_errno(errno, "Failed to pin reserved VT: %m"); + return -errno; + } return 0; } +#endif // 0 static int manager_connect_bus(Manager *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -582,13 +650,6 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add manager object vtable: %m"); - r = sd_bus_add_match(m->bus, NULL, - "type='signal'," - "interface='org.freedesktop.systemd1.Agent'," - "member='Released'," - "path='/org/freedesktop/systemd1/agent'", - signal_agent_released, 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) return log_error_errno(r, "Failed to add seat object vtable: %m"); @@ -613,6 +674,63 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add user enumerator: %m"); +/// elogind does not support systemd action jobs +#if 0 + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='JobRemoved'," + "path='/org/freedesktop/systemd1'", + match_job_removed, m); + if (r < 0) + log_warning_errno(r, "Failed to add match for JobRemoved: %m"); +#endif // 0 + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='UnitRemoved'," + "path='/org/freedesktop/systemd1'", + match_unit_removed, m); + if (r < 0) + log_warning_errno(r, "Failed to add match for UnitRemoved: %m"); + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.DBus.Properties'," + "member='PropertiesChanged'", + match_properties_changed, m); + if (r < 0) + log_warning_errno(r, "Failed to add match for PropertiesChanged: %m"); + + r = sd_bus_add_match(m->bus, + NULL, + "type='signal'," + "sender='org.freedesktop.systemd1'," + "interface='org.freedesktop.systemd1.Manager'," + "member='Reloading'," + "path='/org/freedesktop/systemd1'", + match_reloading, m); + if (r < 0) + log_warning_errno(r, "Failed to add match for Reloading: %m"); + + r = sd_bus_call_method( + m->bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "Subscribe", + &error, + NULL, NULL); + 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) return log_error_errno(r, "Failed to register name: %m"); @@ -707,8 +825,13 @@ static int manager_connect_console(Manager *m) { return -EINVAL; } - assert_se(ignore_signals(SIGRTMIN + 1, -1) >= 0); - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGRTMIN, -1) >= 0); + r = ignore_signals(SIGRTMIN + 1, -1); + if (r < 0) + return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m"); + + r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1); + 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) @@ -794,10 +917,33 @@ static int manager_connect_udev(Manager *m) { return r; } + /* Don't bother watching VCSA devices, if nobody cares */ +/// elogind does not support autospawning of vts +#if 0 + 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; + } +#endif // 0 + 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; @@ -823,8 +969,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); @@ -908,7 +1054,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; @@ -971,6 +1117,12 @@ int manager_startup(Manager *m) { /* Remove stale objects before we start them */ manager_gc(m, false); + /* Reserve the special reserved VT */ +/// elogind does not support autospawning of vts +#if 0 + manager_reserve_vt(m); +#endif // 0 + /* And start everything */ HASHMAP_FOREACH(seat, m->seats, i) seat_start(seat); @@ -992,14 +1144,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; @@ -1008,32 +1158,36 @@ int manager_run(Manager *m) { manager_gc(m, true); - if (manager_dispatch_delayed(m) > 0) - continue; - - if (m->action_what != 0) { - 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; } } static int manager_parse_config_file(Manager *m) { + const char *unit = NULL, *logind_conf, *sections; + FILE *file = NULL; + bool relaxed = false, allow_include = false, warn = true; + assert(m); +/// elogind parses its own config file +#if 0 return config_parse_many("/etc/systemd/logind.conf", CONF_DIRS_NULSTR("systemd/logind.conf"), "Login\0", config_item_perf_lookup, logind_gperf_lookup, false, m); +#endif // 0 + + logind_conf = getenv("ELOGIND_CONF_FILE"); + if (!logind_conf) + logind_conf = PKGSYSCONFDIR "/logind.conf"; + sections = "Login\0Sleep\0"; + + return config_parse(unit, logind_conf, file, sections, + config_item_perf_lookup, logind_gperf_lookup, + relaxed, allow_include, warn, m); } int main(int argc, char *argv[]) { @@ -1058,11 +1212,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", 0755); - mkdir_label("/run/systemd/seats", 0755); - mkdir_label("/run/systemd/users", 0755); - mkdir_label("/run/systemd/sessions", 0755); - mkdir_label("/run/systemd/machines", 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) { @@ -1093,7 +1257,6 @@ finish: "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;