X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=0b7d9653a7621b92fc17dc2c346e29bb5e7c6ecf;hp=8f00c463399bc951015e98e0856e348d08300224;hb=3d1092eab0f4a5c771225c78072a7b6eccb82849;hpb=2ec3ff668ff03410e94cfef8e3ee9384a8222211 diff --git a/src/login/logind.c b/src/login/logind.c index 8f00c4633..0b7d9653a 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -24,19 +24,24 @@ #include #include #include -#include -#include #include "sd-daemon.h" #include "strv.h" #include "conf-parser.h" -#include "mkdir.h" #include "bus-util.h" #include "bus-error.h" -#include "logind.h" #include "udev-util.h" +#include "formats-util.h" +#include "signal-util.h" +#include "label.h" +#include "logind.h" +#include "cgroup.h" +#include "mount-setup.h" +#include "virt.h" + +static void manager_free(Manager *m); -Manager *manager_new(void) { +static Manager *manager_new(void) { Manager *m; int r; @@ -44,11 +49,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; @@ -57,6 +68,7 @@ Manager *manager_new(void) { m->handle_lid_switch = HANDLE_SUSPEND; m->handle_lid_switch_docked = HANDLE_IGNORE; m->lid_switch_ignore_inhibited = true; + m->holdoff_timeout_usec = 30 * USEC_PER_SEC; m->idle_action_usec = 30 * USEC_PER_MINUTE; m->idle_action = HANDLE_IGNORE; @@ -74,16 +86,45 @@ Manager *manager_new(void) { m->user_units = hashmap_new(&string_hash_ops); m->session_units = hashmap_new(&string_hash_ops); - m->busnames = set_new(&string_hash_ops); + m->running_as = MANAGER_SYSTEM; + m->test_run = false; - if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames || - !m->user_units || !m->session_units) + 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; + /* If elogind should be its own controller, mount its cgroup */ + if (streq(ELOGIND_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->udev = udev_new(); if (!m->udev) goto fail; @@ -101,7 +142,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -139,9 +180,11 @@ void manager_free(Manager *m) { hashmap_free(m->user_units); hashmap_free(m->session_units); - set_free_free(m->busnames); - 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); @@ -152,29 +195,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) + (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 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->action_job); + 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); } @@ -290,7 +352,7 @@ static int manager_enumerate_seats(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/seats: %m"); + log_error_errno(errno, "Failed to open /run/systemd/seats: %m"); return -errno; } @@ -327,7 +389,7 @@ static int manager_enumerate_linger_users(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /var/lib/systemd/linger/: %m"); + log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); return -errno; } @@ -339,7 +401,7 @@ static int manager_enumerate_linger_users(Manager *m) { k = manager_add_user_by_name(m, de->d_name, NULL); if (k < 0) { - log_notice("Couldn't add lingering user %s: %s", de->d_name, strerror(-k)); + log_notice_errno(k, "Couldn't add lingering user %s: %m", de->d_name); r = k; } } @@ -363,7 +425,7 @@ static int manager_enumerate_users(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/users: %m"); + log_error_errno(errno, "Failed to open /run/systemd/users: %m"); return -errno; } @@ -375,7 +437,7 @@ static int manager_enumerate_users(Manager *m) { k = manager_add_user_by_name(m, de->d_name, &u); if (k < 0) { - log_error("Failed to add user by file name %s: %s", de->d_name, strerror(-k)); + log_error_errno(k, "Failed to add user by file name %s: %m", de->d_name); r = k; continue; @@ -404,7 +466,7 @@ static int manager_enumerate_sessions(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/sessions: %m"); + log_error_errno(errno, "Failed to open /run/systemd/sessions: %m"); return -errno; } @@ -423,7 +485,7 @@ static int manager_enumerate_sessions(Manager *m) { k = manager_add_session(m, de->d_name, &s); if (k < 0) { - log_error("Failed to add session by file name %s: %s", de->d_name, strerror(-k)); + log_error_errno(k, "Failed to add session by file name %s: %m", de->d_name); r = k; continue; @@ -451,7 +513,7 @@ static int manager_enumerate_inhibitors(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /run/systemd/inhibit: %m"); + log_error_errno(errno, "Failed to open /run/systemd/inhibit: %m"); return -errno; } @@ -464,7 +526,7 @@ static int manager_enumerate_inhibitors(Manager *m) { k = manager_add_inhibitor(m, de->d_name, &i); if (k < 0) { - log_notice("Couldn't add inhibitor %s: %s", de->d_name, strerror(-k)); + log_notice_errno(k, "Couldn't add inhibitor %s: %m", de->d_name); r = k; continue; } @@ -505,6 +567,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; @@ -526,6 +590,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; @@ -552,6 +617,8 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } +/// UNNEEDED by elogind +#if 0 static int manager_reserve_vt(Manager *m) { _cleanup_free_ char *p = NULL; @@ -568,12 +635,41 @@ static int manager_reserve_vt(Manager *m) { /* Don't complain on VT-less systems */ if (errno != ENOENT) - log_warning("Failed to pin reserved VT: %m"); + log_warning_errno(errno, "Failed to pin reserved VT: %m"); return -errno; } return 0; } +#endif // 0 + +static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus_error *error) { + Manager *m = userdata; + Session *s; + const char *cgroup; + int r; + + assert(message); + assert(m); + + 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_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -583,66 +679,47 @@ static int manager_connect_bus(Manager *m) { assert(!m->bus); r = sd_bus_default_system(&m->bus); - if (r < 0) { - log_error("Failed to connect to system bus: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to connect to system bus: %m"); r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/login1", "org.freedesktop.login1.Manager", manager_vtable, m); - if (r < 0) { - log_error("Failed to add manager object vtable: %s", strerror(-r)); - return 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) { - log_error("Failed to add seat object vtable: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/seat", seat_node_enumerator, m); - if (r < 0) { - log_error("Failed to add seat enumerator: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat enumerator: %m"); r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/session", "org.freedesktop.login1.Session", session_vtable, session_object_find, m); - if (r < 0) { - log_error("Failed to add session object vtable: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add session object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/session", session_node_enumerator, m); - if (r < 0) { - log_error("Failed to add session enumerator: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add session enumerator: %m"); r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/login1/user", "org.freedesktop.login1.User", user_vtable, user_object_find, m); - if (r < 0) { - log_error("Failed to add user object vtable: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add user object vtable: %m"); r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/login1/user", user_node_enumerator, m); - if (r < 0) { - log_error("Failed to add user enumerator: %s", strerror(-r)); - return r; - } - - r = sd_bus_add_match(m->bus, - NULL, - "type='signal'," - "sender='org.freedesktop.DBus'," - "interface='org.freedesktop.DBus'," - "member='NameOwnerChanged'," - "path='/org/freedesktop/DBus'", - match_name_owner_changed, m); - if (r < 0) { - log_error("Failed to add match for NameOwnerChanged: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add user enumerator: %m"); +/// elogind does not support systemd as PID 1 +#if 0 r = sd_bus_add_match(m->bus, NULL, "type='signal'," @@ -651,10 +728,8 @@ static int manager_connect_bus(Manager *m) { "member='JobRemoved'," "path='/org/freedesktop/systemd1'", match_job_removed, m); - if (r < 0) { - log_error("Failed to add match for JobRemoved: %s", strerror(-r)); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for JobRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -664,10 +739,8 @@ static int manager_connect_bus(Manager *m) { "member='UnitRemoved'," "path='/org/freedesktop/systemd1'", match_unit_removed, m); - if (r < 0) { - log_error("Failed to add match for UnitRemoved: %s", strerror(-r)); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for UnitRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -676,10 +749,8 @@ static int manager_connect_bus(Manager *m) { "interface='org.freedesktop.DBus.Properties'," "member='PropertiesChanged'", match_properties_changed, m); - if (r < 0) { - log_error("Failed to add match for PropertiesChanged: %s", strerror(-r)); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for PropertiesChanged: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -689,10 +760,8 @@ static int manager_connect_bus(Manager *m) { "member='Reloading'," "path='/org/freedesktop/systemd1'", match_reloading, m); - if (r < 0) { - log_error("Failed to add match for Reloading: %s", strerror(-r)); - return r; - } + if (r < 0) + log_warning_errno(r, "Failed to add match for Reloading: %m"); r = sd_bus_call_method( m->bus, @@ -702,22 +771,17 @@ static int manager_connect_bus(Manager *m) { "Subscribe", &error, NULL, NULL); - if (r < 0) { - log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + log_notice("Failed to enable subscription: %s", bus_error_message(&error, r)); +#endif // 0 r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); - if (r < 0) { - log_error("Failed to register name: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); r = sd_bus_attach_event(m->bus, m->event, 0); - if (r < 0) { - log_error("Failed to attach bus to event loop: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); return 0; } @@ -783,7 +847,7 @@ static int manager_connect_console(Manager *m) { if (errno == ENOENT) return 0; - log_error("Failed to open /sys/class/tty/tty0/active: %m"); + log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); return -errno; } @@ -805,17 +869,8 @@ static int manager_connect_console(Manager *m) { return -EINVAL; } - r = ignore_signals(SIGRTMIN + 1, -1); - if (r < 0) { - log_error("Cannot ignore SIGRTMIN + 1: %s", strerror(-r)); - return r; - } - - r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1); - if (r < 0) { - log_error("Cannot block SIGRTMIN: %s", strerror(-r)); - return r; - } + 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) @@ -902,6 +957,8 @@ 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 (m->n_autovts > 0 && m->console_active_fd >= 0) { m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); @@ -920,11 +977,12 @@ static int manager_connect_udev(Manager *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; @@ -950,8 +1008,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); @@ -1016,34 +1074,26 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us CLOCK_MONOTONIC, elapse, USEC_PER_SEC*30, manager_dispatch_idle_action, m); - if (r < 0) { - log_error("Failed to add idle event source: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add idle event source: %m"); r = sd_event_source_set_priority(m->idle_action_event_source, SD_EVENT_PRIORITY_IDLE+10); - if (r < 0) { - log_error("Failed to set idle event source priority: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to set idle event source priority: %m"); } else { r = sd_event_source_set_time(m->idle_action_event_source, elapse); - if (r < 0) { - log_error("Failed to set idle event timer: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to set idle event timer: %m"); r = sd_event_source_set_enabled(m->idle_action_event_source, SD_EVENT_ONESHOT); - if (r < 0) { - log_error("Failed to enable idle event timer: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to enable idle event timer: %m"); } return 0; } -int manager_startup(Manager *m) { +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; @@ -1061,10 +1111,8 @@ int manager_startup(Manager *m) { /* Connect to udev */ r = manager_connect_udev(m); - if (r < 0) { - log_error("Failed to create udev watchers: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to create udev watchers: %m"); /* Connect to the bus */ r = manager_connect_bus(m); @@ -1073,45 +1121,46 @@ int manager_startup(Manager *m) { /* Instantiate magic seat 0 */ r = manager_add_seat(m, "seat0", &m->seat0); - if (r < 0) { - log_error("Failed to add seat0: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to add seat0: %m"); - r = manager_set_lid_switch_ignore(m, 0 + IGNORE_LID_SWITCH_STARTUP_USEC); + r = manager_set_lid_switch_ignore(m, 0 + m->holdoff_timeout_usec); if (r < 0) - log_warning("Failed to set up lid switch ignore event source: %s", strerror(-r)); + log_warning_errno(r, "Failed to set up lid switch ignore event source: %m"); /* Deserialize state */ r = manager_enumerate_devices(m); if (r < 0) - log_warning("Device enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "Device enumeration failed: %m"); r = manager_enumerate_seats(m); if (r < 0) - log_warning("Seat enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "Seat enumeration failed: %m"); r = manager_enumerate_users(m); if (r < 0) - log_warning("User enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "User enumeration failed: %m"); r = manager_enumerate_sessions(m); if (r < 0) - log_warning("Session enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "Session enumeration failed: %m"); r = manager_enumerate_inhibitors(m); if (r < 0) - log_warning("Inhibitor enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "Inhibitor enumeration failed: %m"); r = manager_enumerate_buttons(m); if (r < 0) - log_warning("Button enumeration failed: %s", strerror(-r)); + log_warning_errno(r, "Button enumeration failed: %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) @@ -1134,14 +1183,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; @@ -1150,42 +1197,58 @@ int manager_run(Manager *m) { manager_gc(m, true); - if (manager_dispatch_delayed(m) > 0) + r = manager_dispatch_delayed(m, false); + if (r < 0) + return r; + if (r > 0) continue; - if (m->action_what != 0 && !m->action_job) { - 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); - return config_parse(NULL, "/etc/systemd/logind.conf", NULL, - "Login\0", +/// 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, - false, false, true, m); + relaxed, allow_include, warn, m); } 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(); log_open(); +#ifdef ENABLE_DEBUG_ELOGIND + log_set_max_level(LOG_DEBUG); +#endif // ENABLE_DEBUG_ELOGIND + umask(0022); if (argc != 1) { @@ -1199,9 +1262,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/seats", 0755); - mkdir_label("/run/systemd/users", 0755); - mkdir_label("/run/systemd/sessions", 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) { @@ -1213,11 +1288,11 @@ int main(int argc, char *argv[]) { r = manager_startup(m); if (r < 0) { - log_error("Failed to fully start up daemon: %s", strerror(-r)); + log_error_errno(r, "Failed to fully start up daemon: %m"); goto finish; } - log_debug("systemd-logind running as pid "PID_FMT, getpid()); + log_debug("logind running as pid "PID_FMT, getpid()); sd_notify(false, "READY=1\n" @@ -1225,14 +1300,13 @@ int main(int argc, char *argv[]) { r = manager_run(m); - log_debug("systemd-logind stopped as pid "PID_FMT, getpid()); + log_debug("logind stopped as pid "PID_FMT, getpid()); finish: sd_notify(false, "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;