X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=2efa78c19ff638c31f4be7d9798d9617524ca027;hb=d2dedf1570f8ab5217aec3b26bf51d1d34accbde;hp=b976981006a77e8fe2ce1882269ee3e1e66326a9;hpb=da22b4dccb157393d36cfce6656ddbd9f224f5e3;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index b97698100..2efa78c19 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -42,21 +42,15 @@ #include "signal-util.h" #include "strv.h" #include "udev-util.h" - -/// additional includes elogind needs +/// Additional includes needed by elogind #include "cgroup.h" // From src/core/ +#include "elogind.h" #include "label.h" -#include "mount-setup.h" // From src/core #include "musl_missing.h" static void manager_free(Manager *m); static void manager_reset_config(Manager *m) { - -#ifdef ENABLE_DEBUG_ELOGIND - int dbg_cnt; -#endif // ENABLE_DEBUG_ELOGIND - #if 0 /// elogind does not support autospawning of vts m->n_autovts = 6; m->reserve_vt = 6; @@ -79,7 +73,7 @@ static void manager_reset_config(Manager *m) { m->idle_action = HANDLE_IGNORE; m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */ - m->user_tasks_max = system_tasks_max_scale(33U, 100U); /* 33% */ + m->user_tasks_max = system_tasks_max_scale(DEFAULT_USER_TASKS_MAX_PERCENTAGE, 100U); /* 33% */ m->sessions_max = 8192; m->inhibitors_max = 8192; @@ -87,45 +81,9 @@ static void manager_reset_config(Manager *m) { m->kill_only_users = strv_free(m->kill_only_users); m->kill_exclude_users = strv_free(m->kill_exclude_users); - - /* 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->hibernate_mode) - m->hibernate_mode = strv_new("platform", "shutdown", NULL); - if (!m->hibernate_state) - m->hibernate_state = strv_new("disk", NULL); - if (!m->hybrid_sleep_mode) - m->hybrid_sleep_mode = strv_new("suspend", "platform", "shutdown", NULL); - if (!m->hybrid_sleep_state) - m->hybrid_sleep_state = strv_new("disk", NULL); - -#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 +#if 1 /// elogind needs an Add-On for sleep configuration + elogind_manager_reset_config(m); +#endif // 1 } static Manager *manager_new(void) { @@ -136,7 +94,6 @@ static Manager *manager_new(void) { if (!m) return NULL; - m->pin_cgroupfs_fd = -1; m->console_active_fd = -1; #if 0 /// UNNEEDED by elogind m->reserve_vt_fd = -1; @@ -154,30 +111,14 @@ static Manager *manager_new(void) { m->user_units = hashmap_new(&string_hash_ops); m->session_units = hashmap_new(&string_hash_ops); - 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; - /* 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 1 /// elogind needs some more data + r = elogind_manager_new(m); if (r < 0) 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; - +#endif // 1 m->udev = udev_new(); if (!m->udev) goto fail; @@ -205,7 +146,8 @@ static void manager_free(Manager *m) { Inhibitor *i; Button *b; - assert(m); + if (!m) + return; while ((session = hashmap_first(m->sessions))) session_free(session); @@ -268,8 +210,9 @@ static void manager_free(Manager *m) { #if 0 /// elogind does not support autospawning of vts safe_close(m->reserve_vt_fd); #endif // 0 - - manager_shutdown_cgroup(m, true); +#if 1 /// elogind has to free its own data + elogind_manager_free(m); +#endif // 1 strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); @@ -277,14 +220,6 @@ static void manager_free(Manager *m) { 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); - #if 0 /// UNNEEDED by elogind free(m->action_job); #endif // 0 @@ -687,46 +622,6 @@ static int manager_reserve_vt(Manager *m) { } #endif // 0 -static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus_error *error) { - _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; - Manager *m = userdata; - const char *cgroup; - Session *s; - uid_t sender_uid; - int r; - - assert(message); - assert(m); - - /* only accept org.freedesktop.systemd1.Agent from UID=0 */ - r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds); - if (r < 0) - return r; - - r = sd_bus_creds_get_euid(creds, &sender_uid); - if (r < 0 || sender_uid != 0) - return 0; - - /* parse 'cgroup-empty' notification */ - r = sd_bus_message_read(message, "s", &cgroup); - if (r < 0) { - bus_log_parse_error(r); - return 0; - } - - s = hashmap_get(m->sessions, cgroup); - - if (!s) { - log_warning("Session not found: %s", cgroup); - return 0; - } - - session_finalize(s); - session_free(s); - - return 0; -} - static int manager_connect_bus(Manager *m) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; int r; @@ -742,16 +637,6 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add manager object vtable: %m"); - /* elogind relies on signals from its release agent */ - r = sd_bus_add_match( - m->bus, - NULL, - "type='signal'," - "interface='org.freedesktop.elogind.Agent'," - "member='Released'," - "path='/org/freedesktop/elogind/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"); @@ -842,7 +727,14 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to attach bus to event loop: %m"); +#if 0 /// elogind has to setup its release agent return 0; +#else + elogind_bus_setup_system(m); + r = elogind_setup_cgroups_agent(m); + + return r; +#endif // 0 } static int manager_vt_switch(sd_event_source *src, const struct signalfd_siginfo *si, void *data) { @@ -1154,7 +1046,7 @@ static int manager_parse_config_file(Manager *m) { #if 0 /// elogind parses its own config file assert(m); - return config_parse_many(PKGSYSCONFDIR "/logind.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/logind.conf", CONF_PATHS_NULSTR("systemd/logind.conf.d"), "Login\0", config_item_perf_lookup, logind_gperf_lookup, @@ -1316,12 +1208,15 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_AUTO); log_set_facility(LOG_AUTH); log_parse_environment(); - log_open(); #ifdef ENABLE_DEBUG_ELOGIND log_set_max_level(LOG_DEBUG); + log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); #endif // ENABLE_DEBUG_ELOGIND + log_open(); + + umask(0022); if (argc != 1) { @@ -1392,8 +1287,7 @@ finish: "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) - manager_free(m); + manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }