X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=09007c2554343aef4ab7d6304c45c4b7b7ab4343;hb=e19b8719a54c343372e16b462c27f1e84c987b85;hp=4bbbdf55425e4824a7140d385624e9dbee3ad49c;hpb=98d5c9dbd0d47bc1c91dd54514d316cc1c590b05;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index 4bbbdf554..09007c255 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -35,6 +35,7 @@ #include "formats-util.h" #include "label.h" #include "label.h" +#include "cgroup.h" static void manager_free(Manager *m); @@ -46,11 +47,17 @@ static 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; @@ -77,6 +84,9 @@ static Manager *manager_new(void) { m->user_units = hashmap_new(&string_hash_ops); m->session_units = hashmap_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->user_units || !m->session_units) goto fail; @@ -84,6 +94,11 @@ static Manager *manager_new(void) { if (!m->kill_exclude_users) goto fail; + /* Make cgroups */ + r = manager_setup_cgroup(m); + if (r < 0) + goto fail; + m->udev = udev_new(); if (!m->udev) goto fail; @@ -169,7 +184,12 @@ static void manager_free(Manager *m) { 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 + + manager_shutdown_cgroup(m, true); strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); @@ -177,7 +197,6 @@ static void manager_free(Manager *m) { free(m->scheduled_shutdown_type); free(m->scheduled_shutdown_tty); free(m->wall_message); - free(m->action_job); free(m); } @@ -508,6 +527,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; @@ -529,6 +550,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; @@ -555,6 +577,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; @@ -577,6 +601,7 @@ static int manager_reserve_vt(Manager *m) { return 0; } +#endif // 0 static int manager_connect_bus(Manager *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -617,6 +642,8 @@ 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 action jobs +#if 0 r = sd_bus_add_match(m->bus, NULL, "type='signal'," @@ -626,7 +653,8 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_job_removed, m); if (r < 0) - return log_error_errno(r, "Failed to add match for JobRemoved: %m"); + log_warning_errno(r, "Failed to add match for JobRemoved: %m"); +#endif // 0 r = sd_bus_add_match(m->bus, NULL, @@ -637,7 +665,7 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_unit_removed, m); if (r < 0) - return log_error_errno(r, "Failed to add match for UnitRemoved: %m"); + log_warning_errno(r, "Failed to add match for UnitRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -647,7 +675,7 @@ static int manager_connect_bus(Manager *m) { "member='PropertiesChanged'", match_properties_changed, m); if (r < 0) - return log_error_errno(r, "Failed to add match for PropertiesChanged: %m"); + log_warning_errno(r, "Failed to add match for PropertiesChanged: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -658,8 +686,8 @@ static int manager_connect_bus(Manager *m) { "path='/org/freedesktop/systemd1'", match_reloading, m); if (r < 0) - return log_error_errno(r, "Failed to add match for Reloading: %m"); -#if 0 + log_warning_errno(r, "Failed to add match for Reloading: %m"); + r = sd_bus_call_method( m->bus, "org.freedesktop.systemd1", @@ -668,11 +696,9 @@ 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; - } -#endif // 0 + if (r < 0) + log_notice("Failed to enable subscription: %s", bus_error_message(&error, r)); + r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) return log_error_errno(r, "Failed to register name: %m"); @@ -860,6 +886,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"); @@ -878,6 +906,7 @@ static int manager_connect_udev(Manager *m) { if (r < 0) return r; } +#endif // 0 return 0; } @@ -1057,7 +1086,10 @@ static int manager_startup(Manager *m) { 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) @@ -1132,9 +1164,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) { @@ -1150,7 +1194,7 @@ int main(int argc, char *argv[]) { 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" @@ -1158,7 +1202,7 @@ 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,