X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=e0cd70448eb4bb8ccd3043d2c429443f662857b8;hp=8748490f45f65eea1f864a1a4b36043c07e0034e;hb=01fd08090305c451325783d8ca5a89416fcacfaa;hpb=9d615aabbd765b1186932b1bbd1932eb3fa20523 diff --git a/src/login/logind.c b/src/login/logind.c index 8748490f4..e0cd70448 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -20,27 +18,40 @@ ***/ #include -#include #include #include #include +#include "libudev.h" #include "sd-daemon.h" -#include "strv.h" -#include "conf-parser.h" -#include "bus-util.h" + +#include "alloc-util.h" #include "bus-error.h" +#include "bus-util.h" +#include "conf-parser.h" +#include "def.h" +#include "dirent-util.h" +#include "fd-util.h" +#include "formats-util.h" #include "logind.h" +#include "selinux-util.h" +#include "signal-util.h" +#include "strv.h" #include "udev-util.h" -#include "formats-util.h" -#include "label.h" + +/// additional includes elogind needs +#include "cgroup.h" // From src/core/ #include "label.h" -#include "cgroup.h" -#include "virt.h" +#include "mount-setup.h" // From src/core +#include "musl_missing.h" static void manager_free(Manager *m); +static int manager_parse_config_file(Manager *m); static Manager *manager_new(void) { +#ifdef ENABLE_DEBUG_ELOGIND + int dbg_cnt; +#endif // ENABLE_DEBUG_ELOGIND Manager *m; int r; @@ -52,8 +63,7 @@ static Manager *manager_new(void) { m->console_active_fd = -1; -/// elogind does not support autospawning of vts -#if 0 +#if 0 /// elogind does not support autospawning of vts m->reserve_vt_fd = -1; m->n_autovts = 6; @@ -74,6 +84,7 @@ static Manager *manager_new(void) { m->idle_action_not_before_usec = now(CLOCK_MONOTONIC); m->runtime_dir_size = PAGE_ALIGN((size_t) (physical_memory() / 10)); /* 10% */ + m->user_tasks_max = UINT64_C(12288); m->devices = hashmap_new(&string_hash_ops); m->seats = hashmap_new(&string_hash_ops); @@ -95,27 +106,80 @@ static Manager *manager_new(void) { if (!m->kill_exclude_users) goto fail; + /* If elogind should be its own controller, mount its cgroup */ + if (streq(SYSTEMD_CGROUP_CONTROLLER, "name=elogind")) { + r = mount_setup(true); + if (r < 0) + 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->suspend_mode = NULL; + m->suspend_state = NULL; + m->hibernate_mode = NULL; + m->hibernate_state = NULL; + m->hybrid_sleep_mode = NULL; + m->hybrid_sleep_state = NULL; + + manager_parse_config_file(m); + + /* Set default Sleep config if not already set by logind.conf */ + if (!m->suspend_state) { + m->suspend_state = strv_new("mem", "standby", "freeze", NULL); + if (!m->suspend_state) + goto fail; + } + if (!m->hibernate_mode) { + m->hibernate_mode = strv_new("platform", "shutdown", NULL); + if (!m->hibernate_mode) + goto fail; + } + if (!m->hibernate_state) { + m->hibernate_state = strv_new("disk", NULL); + if (!m->hibernate_state) + goto fail; + } + if (!m->hybrid_sleep_mode) { + m->hybrid_sleep_mode = strv_new("suspend", "platform", "shutdown", NULL); + if (!m->hybrid_sleep_mode) + goto fail; + } + if (!m->hybrid_sleep_state) { + m->hybrid_sleep_state = strv_new("disk", NULL); + if (!m->hybrid_sleep_state) + goto fail; + } + +#ifdef ENABLE_DEBUG_ELOGIND + dbg_cnt = -1; + while (m->suspend_mode && m->suspend_mode[++dbg_cnt]) + log_debug_elogind("suspend_mode[%d] = %s", + dbg_cnt, m->suspend_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->suspend_state[++dbg_cnt]) + log_debug_elogind("suspend_state[%d] = %s", + dbg_cnt, m->suspend_state[dbg_cnt]); + dbg_cnt = -1; + while (m->hibernate_mode[++dbg_cnt]) + log_debug_elogind("hibernate_mode[%d] = %s", + dbg_cnt, m->hibernate_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->hibernate_state[++dbg_cnt]) + log_debug_elogind("hibernate_state[%d] = %s", + dbg_cnt, m->hibernate_state[dbg_cnt]); + dbg_cnt = -1; + while (m->hybrid_sleep_mode[++dbg_cnt]) + log_debug_elogind("hybrid_sleep_mode[%d] = %s", + dbg_cnt, m->hybrid_sleep_mode[dbg_cnt]); + dbg_cnt = -1; + while (m->hybrid_sleep_state[++dbg_cnt]) + log_debug_elogind("hybrid_sleep_state[%d] = %s", + dbg_cnt, m->hybrid_sleep_state[dbg_cnt]); +#endif // ENABLE_DEBUG_ELOGIND m->udev = udev_new(); if (!m->udev) @@ -195,24 +259,17 @@ static void manager_free(Manager *m) { udev_unref(m->udev); if (m->unlink_nologin) - unlink("/run/nologin"); + (void) 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 +#if 0 /// elogind does not support autospawning of vts 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); @@ -344,8 +401,7 @@ static int manager_enumerate_seats(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); } FOREACH_DIRENT(de, d, return -errno) { @@ -381,8 +437,7 @@ static int manager_enumerate_linger_users(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); } FOREACH_DIRENT(de, d, return -errno) { @@ -417,8 +472,7 @@ static int manager_enumerate_users(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /run/systemd/users: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/users: %m"); } FOREACH_DIRENT(de, d, return -errno) { @@ -458,8 +512,7 @@ static int manager_enumerate_sessions(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); } FOREACH_DIRENT(de, d, return -errno) { @@ -505,8 +558,7 @@ static int manager_enumerate_inhibitors(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); } FOREACH_DIRENT(de, d, return -errno) { @@ -559,8 +611,7 @@ static int manager_dispatch_device_udev(sd_event_source *s, int fd, uint32_t rev return 0; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind 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; @@ -609,8 +660,7 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } -/// UNNEEDED by elogind -#if 0 +#if 0 /// UNNEEDED by elogind static int manager_reserve_vt(Manager *m) { _cleanup_free_ char *p = NULL; @@ -664,7 +714,7 @@ static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus } static int manager_connect_bus(Manager *m) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; int r; assert(m); @@ -710,8 +760,7 @@ 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 as PID 1 -#if 0 +#if 0 /// elogind does not support systemd as PID 1 r = sd_bus_add_match(m->bus, NULL, "type='signal'," @@ -721,7 +770,7 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_job_removed, m); if (r < 0) - log_warning_errno(r, "Failed to add match for JobRemoved: %m"); + return log_error_errno(r, "Failed to add match for JobRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -732,7 +781,7 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_unit_removed, m); if (r < 0) - log_warning_errno(r, "Failed to add match for UnitRemoved: %m"); + return log_error_errno(r, "Failed to add match for UnitRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -742,7 +791,7 @@ static int manager_connect_bus(Manager *m) { "member='PropertiesChanged'", match_properties_changed, m); if (r < 0) - log_warning_errno(r, "Failed to add match for PropertiesChanged: %m"); + return log_error_errno(r, "Failed to add match for PropertiesChanged: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -753,7 +802,7 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_reloading, m); if (r < 0) - log_warning_errno(r, "Failed to add match for Reloading: %m"); + return log_error_errno(r, "Failed to add match for Reloading: %m"); r = sd_bus_call_method( m->bus, @@ -763,15 +812,17 @@ static int manager_connect_bus(Manager *m) { "Subscribe", &error, NULL, NULL); - if (r < 0) - log_notice("Failed to enable subscription: %s", bus_error_message(&error, r)); + if (r < 0) { + log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); + return r; + } #endif // 0 r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) return log_error_errno(r, "Failed to register name: %m"); - r = sd_bus_attach_event(m->bus, m->event, 0); + r = sd_bus_attach_event(m->bus, m->event, SD_EVENT_PRIORITY_NORMAL); if (r < 0) return log_error_errno(r, "Failed to attach bus to event loop: %m"); @@ -839,8 +890,7 @@ static int manager_connect_console(Manager *m) { if (errno == ENOENT) return 0; - log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); - return -errno; + return log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); } r = sd_event_add_io(m->event, &m->console_active_event_source, m->console_active_fd, 0, manager_dispatch_console, m); @@ -861,13 +911,8 @@ static int manager_connect_console(Manager *m) { return -EINVAL; } - 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"); + assert_se(ignore_signals(SIGRTMIN + 1, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGRTMIN, -1) >= 0); r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m); if (r < 0) @@ -954,8 +999,7 @@ static int manager_connect_udev(Manager *m) { } /* Don't bother watching VCSA devices, if nobody cares */ -/// elogind does not support autospawning of vts -#if 0 +#if 0 /// elogind does not support autospawning of vts if (m->n_autovts > 0 && m->console_active_fd >= 0) { m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); @@ -1154,8 +1198,7 @@ static int manager_startup(Manager *m) { manager_gc(m, false); /* Reserve the special reserved VT */ -/// elogind does not support autospawning of vts -#if 0 +#if 0 /// elogind does not support autospawning of vts manager_reserve_vt(m); #endif // 0 @@ -1194,6 +1237,12 @@ static int manager_run(Manager *m) { manager_gc(m, true); + r = manager_dispatch_delayed(m, false); + if (r < 0) + return r; + if (r > 0) + continue; + r = sd_event_run(m->event, (uint64_t) -1); if (r < 0) return r; @@ -1201,35 +1250,34 @@ static int manager_run(Manager *m) { } 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; +#if 0 /// elogind parses its own config file assert(m); -/// elogind parses its own config file -#if 0 - return config_parse_many("/etc/systemd/logind.conf", - CONF_DIRS_NULSTR("systemd/logind.conf"), + return config_parse_many(PKGSYSCONFDIR "/logind.conf", + CONF_PATHS_NULSTR("systemd/logind.conf.d"), "Login\0", config_item_perf_lookup, logind_gperf_lookup, false, m); -#endif // 0 +#else + const char* logind_conf = getenv("ELOGIND_CONF_FILE"); + + assert(m); - 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, + return config_parse(NULL, logind_conf, NULL, "Login\0Sleep\0", config_item_perf_lookup, logind_gperf_lookup, - relaxed, allow_include, warn, m); + false, false, true, m); +#endif // 0 } int main(int argc, char *argv[]) { Manager *m = NULL; int r; + elogind_set_program_name(argv[0]); log_set_target(LOG_TARGET_AUTO); log_set_facility(LOG_AUTH); log_parse_environment(); @@ -1247,11 +1295,22 @@ int main(int argc, char *argv[]) { goto finish; } + r = mac_selinux_init(); + if (r < 0) { + log_error_errno(r, "Could not initialize labelling: %m"); + goto finish; + } + /* Always create the directories people can create inotify * watches in. Note that some applications might check for the * existence of /run/systemd/seats/ to determine whether * logind is available, so please always make sure this check * stays in. */ +#if 0 /// elogind can not rely on systemd to help, so we need a bit more effort than this + mkdir_label("/run/systemd/seats", 0755); + mkdir_label("/run/systemd/users", 0755); + mkdir_label("/run/systemd/sessions", 0755); +#else r = mkdir_label("/run/systemd", 0755); if ( (r < 0) && (-EEXIST != r) ) return log_error_errno(r, "Failed to create /run/systemd : %m"); @@ -1267,6 +1326,7 @@ int main(int argc, char *argv[]) { r = mkdir_label("/run/systemd/machines", 0755); if ( r < 0 && (-EEXIST != r) ) return log_error_errno(r, "Failed to create /run/systemd/machines : %m"); +#endif // 0 m = manager_new(); if (!m) { @@ -1274,15 +1334,13 @@ int main(int argc, char *argv[]) { goto finish; } - manager_parse_config_file(m); - r = manager_startup(m); if (r < 0) { log_error_errno(r, "Failed to fully start up daemon: %m"); goto finish; } - log_debug("logind running as pid "PID_FMT, getpid()); + log_debug("elogind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1290,7 +1348,7 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("logind stopped as pid "PID_FMT, getpid()); + log_debug("elogind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false,