#include <string.h>
#include <unistd.h>
-#include "label.h"
#include "sd-daemon.h"
#include "strv.h"
-#include "cgroup-util.h"
#include "conf-parser.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "logind.h"
#include "udev-util.h"
+#include "signal-util.h"
+#include "logind.h"
Manager *manager_new(void) {
Manager *m;
if (!m->kill_exclude_users)
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;
sd_event_set_watchdog(m->event, true);
-
return m;
fail:
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
- 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);
}
return 0;
}
-static int manager_dispatch_button_udev(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+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;
+ const char *name;
assert(m);
- d = udev_monitor_receive_device(m->udev_button_monitor);
+ d = udev_monitor_receive_device(m->udev_vcsa_monitor);
if (!d)
return -ENOMEM;
- manager_process_button_device(m, d);
- return 0;
-}
+ name = udev_device_get_sysname(d);
-static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
- Manager *m = userdata;
+ /* Whenever a VCSA device is removed try to reallocate our
+ * VTs, to make sure our auto VTs never go away. */
- assert(m);
- assert(m->seat0);
- assert(m->console_active_fd == fd);
+ if (name && startswith(name, "vcsa") && streq_ptr(udev_device_get_action(d), "remove"))
+ seat_preallocate_vts(m->seat0);
- seat_read_active_vt(m->seat0);
return 0;
}
-static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
+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;
Manager *m = userdata;
- Session *s;
- const char *cgroup;
- int r;
- assert(bus);
- assert(message);
assert(m);
- r = sd_bus_message_read(message, "s", &cgroup);
- if (r < 0) {
- bus_log_parse_error(r);
- return 0;
- }
+ d = udev_monitor_receive_device(m->udev_button_monitor);
+ if (!d)
+ return -ENOMEM;
- s = hashmap_get(m->sessions, cgroup);
+ manager_process_button_device(m, d);
+ return 0;
+}
- if (!s) {
- log_warning("Session not found: %s", cgroup);
- return 0;
- }
+static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+ Manager *m = userdata;
- session_finalize(s);
- session_free(s);
+ assert(m);
+ assert(m->seat0);
+ assert(m->console_active_fd == fd);
+ seat_read_active_vt(m->seat0);
return 0;
}
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");
return 0;
}
-static int manager_setup_cgroup(Manager *m) {
- _cleanup_free_ char *path = NULL;
- int r;
-
- assert(m);
-
- /* 1. Determine hierarchy */
- free(m->cgroup_root);
- m->cgroup_root = NULL;
-
- r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root);
- if (r < 0)
- return log_error_errno(r, "Cannot determine cgroup we are running in: %m");
-
- /* Make sure to store away the root value without trailing
- * slash, even for the root dir, so that we can easily prepend
- * it everywhere. */
- if (streq(m->cgroup_root, "/"))
- m->cgroup_root[0] = 0;
-
- /* 2. Show data */
- r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
- if (r < 0)
- return log_error_errno(r, "Cannot find cgroup mount point: %m");
-
- log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
-
- /* 3. Install agent */
- r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
- if (r < 0)
- log_warning_errno(r, "Failed to install release agent, ignoring: %m");
- else if (r > 0)
- log_debug("Installed release agent.");
- else
- log_debug("Release agent already installed.");
-
- /* 4. Make sure we are in the root cgroup */
- r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0);
- if (r < 0)
- return log_error_errno(r, "Failed to create root cgroup hierarchy: %m");
-
- /* 5. And pin it, so that it cannot be unmounted */
- safe_close(m->pin_cgroupfs_fd);
-
- m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK);
- if (m->pin_cgroupfs_fd < 0)
- return log_error_errno(errno, "Failed to open pin file: %m");
-
- return 0;
-}
-
static int manager_connect_console(Manager *m) {
int r;
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)
assert(m);
- /* Make cgroups */
- r = manager_setup_cgroup(m);
- if (r < 0)
- return r;
-
/* Connect to console */
r = manager_connect_console(m);
if (r < 0)
}
static int manager_parse_config_file(Manager *m) {
- const char *unit, *logind_conf, *sections;
- FILE *file;
- bool relaxed, allow_include, warn;
-
assert(m);
- unit = NULL;
- logind_conf = getenv("ELOGIND_CONF_FILE");
- if (!logind_conf)
- logind_conf = PKGSYSCONFDIR "/logind.conf";
- sections = "Login\0Sleep\0";
- file = NULL;
- relaxed = false;
- allow_include = false;
- warn = true;
-
- return config_parse(unit, logind_conf, file, sections,
- config_item_perf_lookup, logind_gperf_lookup,
- relaxed, allow_include, warn, m);
+ 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);
}
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);
m = manager_new();
if (!m) {
~ianmdlvl / elogind.git / blobdiff