X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=586d92fcaf0b1f630fcb16a4a0f2bdfd34ca9433;hb=faf2e887be42215c1999950d16d1975e70bbdfe9;hp=78753bca495895b6f0a9ddbcec1cbd55fcd4b33c;hpb=3a35bb2809b93b2426bdf194c16cdcc1d9a65447;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index 78753bca4..586d92fca 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -33,6 +33,9 @@ #include "logind.h" #include "udev-util.h" #include "formats-util.h" +#include "label.h" +#include "label.h" +#include "cgroup.h" static void manager_free(Manager *m); @@ -44,6 +47,8 @@ static Manager *manager_new(void) { if (!m) return NULL; + m->pin_cgroupfs_fd = -1; + m->console_active_fd = -1; m->reserve_vt_fd = -1; @@ -75,16 +80,21 @@ static 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; + /* Make cgroups */ + r = manager_setup_cgroup(m); + if (r < 0) + goto fail; + m->udev = udev_new(); if (!m->udev) goto fail; @@ -140,8 +150,6 @@ static 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); @@ -157,16 +165,11 @@ static 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) @@ -179,6 +182,8 @@ static void manager_free(Manager *m) { safe_close(m->reserve_vt_fd); + manager_shutdown_cgroup(m, true); + strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); @@ -625,17 +630,6 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add user enumerator: %m"); - 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) - return log_error_errno(r, "Failed to add match for NameOwnerChanged: %m"); - r = sd_bus_add_match(m->bus, NULL, "type='signal'," @@ -645,7 +639,7 @@ 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"); r = sd_bus_add_match(m->bus, NULL, @@ -656,7 +650,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, @@ -666,7 +660,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, @@ -677,7 +671,7 @@ 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"); + log_warning_errno(r, "Failed to add match for Reloading: %m"); r = sd_bus_call_method( m->bus, @@ -687,10 +681,8 @@ 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)); r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) @@ -927,8 +919,8 @@ static 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); @@ -1151,9 +1143,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) { @@ -1184,7 +1188,6 @@ finish: "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;