#include "conf-parser.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 "logind.h"
+#include "label.h"
+#include "label.h"
+#include "cgroup.h"
static void manager_free(Manager *m);
if (!m)
return NULL;
+ m->pin_cgroupfs_fd = -1;
+
m->console_active_fd = -1;
m->reserve_vt_fd = -1;
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;
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);
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");
+ unlink("/run/nologin");
bus_verify_polkit_async_registry_free(m->polkit_registry);
safe_close(m->reserve_vt_fd);
+ manager_shutdown_cgroup(m, true);
+
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
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',"
"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,
"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,
"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,
"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,
"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)
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);
manager_gc(m, true);
- r = manager_dispatch_delayed(m, false);
- if (r < 0)
- return r;
- if (r > 0)
- continue;
-
r = sd_event_run(m->event, (uint64_t) -1);
if (r < 0)
return r;
* 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) {
"STOPPING=1\n"
"STATUS=Shutting down...");
- if (m)
manager_free(m);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;