#include "def.h"
#include "dirent-util.h"
#include "fd-util.h"
-#include "formats-util.h"
+#include "format-util.h"
#include "logind.h"
#include "selinux-util.h"
#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;
m->idle_action = HANDLE_IGNORE;
m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */
- m->user_tasks_max = 12288;
+ m->user_tasks_max = system_tasks_max_scale(DEFAULT_USER_TASKS_MAX_PERCENTAGE, 100U); /* 33% */
m->sessions_max = 8192;
m->inhibitors_max = 8192;
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
}
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;
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;
Inhibitor *i;
Button *b;
- assert(m);
+ if (!m)
+ return;
while ((session = hashmap_first(m->sessions)))
session_free(session);
#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);
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
return r;
}
+static int manager_attach_fds(Manager *m) {
+ _cleanup_strv_free_ char **fdnames = NULL;
+ int n, i, fd;
+
+ /* Upon restart, PID1 will send us back all fds of session devices
+ * that we previously opened. Each file descriptor is associated
+ * with a given session. The session ids are passed through FDNAMES. */
+
+ n = sd_listen_fds_with_names(true, &fdnames);
+ if (n <= 0)
+ return n;
+
+ for (i = 0; i < n; i++) {
+ struct stat st;
+ SessionDevice *sd;
+ Session *s;
+ char *id;
+
+ fd = SD_LISTEN_FDS_START + i;
+
+ id = startswith(fdnames[i], "session-");
+ if (!id)
+ continue;
+
+ s = hashmap_get(m->sessions, id);
+ if (!s) {
+ /* If the session doesn't exist anymore, the associated session
+ * device attached to this fd doesn't either. Let's simply close
+ * this fd. */
+ log_debug("Failed to attach fd for unknown session: %s", id);
+ close_nointr(fd);
+ continue;
+ }
+
+ if (fstat(fd, &st) < 0) {
+ /* The device is allowed to go away at a random point, in which
+ * case fstat failing is expected. */
+ log_debug_errno(errno, "Failed to stat device fd for session %s: %m", id);
+ close_nointr(fd);
+ continue;
+ }
+
+ sd = hashmap_get(s->devices, &st.st_rdev);
+ if (!sd) {
+ /* Weird we got an fd for a session device which wasn't
+ * recorded in the session state file... */
+ log_warning("Got fd for missing session device [%u:%u] in session %s",
+ major(st.st_rdev), minor(st.st_rdev), s->id);
+ close_nointr(fd);
+ continue;
+ }
+
+ log_debug("Attaching fd to session device [%u:%u] for session %s",
+ major(st.st_rdev), minor(st.st_rdev), s->id);
+
+ session_device_attach_fd(sd, fd, s->was_active);
+ }
+
+ return 0;
+}
+
static int manager_enumerate_sessions(Manager *m) {
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
- int r = 0;
+ int r = 0, k;
assert(m);
FOREACH_DIRENT(de, d, return -errno) {
struct Session *s;
- int k;
if (!dirent_is_file(de))
continue;
k = manager_add_session(m, de->d_name, &s);
if (k < 0) {
log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name);
-
r = k;
continue;
}
r = k;
}
+ /* We might be restarted and PID1 could have sent us back the
+ * session device fds we previously saved. */
+ k = manager_attach_fds(m);
+ if (k < 0)
+ log_warning_errno(k, "Failed to reattach session device fds: %m");
+
return r;
}
}
#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;
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");
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
+ 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) {
#if 0 /// elogind parses its own config file
assert(m);
- 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);
+ return config_parse_many_nulstr(PKGSYSCONFDIR "/logind.conf",
+ CONF_PATHS_NULSTR("systemd/logind.conf.d"),
+ "Login\0",
+ config_item_perf_lookup, logind_gperf_lookup,
+ false, m);
#else
const char* logind_conf = getenv("ELOGIND_CONF_FILE");
else
log_info("Config file reloaded.");
+#if 1 /// elogind needs an Add-On for sleep configuration
+ elogind_manager_reset_config(m);
+#endif // 1
+
return 0;
}
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);
manager_parse_config_file(m);
+#if 1 /// elogind needs an Add-On for sleep configuration
+ elogind_manager_reset_config(m);
+#endif // 1
+
r = manager_startup(m);
if (r < 0) {
log_error_errno(r, "Failed to fully start up daemon: %m");
"STOPPING=1\n"
"STATUS=Shutting down...");
- if (m)
- manager_free(m);
+ manager_free(m);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}