#include <sys/epoll.h>
#include "sd-daemon.h"
-
#include "strv.h"
#include "conf-parser.h"
#include "cgroup-util.h"
#include "mkdir.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "machined.h"
#include "label.h"
+#include "machine-image.h"
+#include "machined.h"
Manager *manager_new(void) {
Manager *m;
void manager_free(Manager *m) {
Machine *machine;
+ Image *i;
assert(m);
hashmap_free(m->machine_units);
hashmap_free(m->machine_leaders);
+ while ((i = hashmap_steal_first(m->image_cache)))
+ image_unref(i);
+
+ hashmap_free(m->image_cache);
+
+ sd_event_source_unref(m->image_cache_defer_event);
+
+ bus_verify_polkit_async_registry_free(m->polkit_registry);
+
sd_bus_unref(m->bus);
sd_event_unref(m->event);
if (errno == ENOENT)
return 0;
- log_error("Failed to open /run/systemd/machines: %m");
+ log_error_errno(errno, "Failed to open /run/systemd/machines: %m");
return -errno;
}
k = manager_add_machine(m, de->d_name, &machine);
if (k < 0) {
- log_error_errno(-k, "Failed to add machine by file name %s: %m", de->d_name);
+ log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name);
r = k;
continue;
assert(!m->bus);
r = sd_bus_default_system(&m->bus);
- if (r < 0) {
- log_error_errno(-r, "Failed to connect to system bus: %m");
- 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/machine1", "org.freedesktop.machine1.Manager", manager_vtable, m);
- if (r < 0) {
- log_error_errno(-r, "Failed to add manager object vtable: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add manager object vtable: %m");
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/machine1/machine", "org.freedesktop.machine1.Machine", machine_vtable, machine_object_find, m);
- if (r < 0) {
- log_error_errno(-r, "Failed to add machine object vtable: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add machine object vtable: %m");
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/machine1/machine", machine_node_enumerator, m);
- if (r < 0) {
- log_error_errno(-r, "Failed to add machine enumerator: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add machine enumerator: %m");
+
+ r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/machine1/image", "org.freedesktop.machine1.Image", image_vtable, image_object_find, m);
+ if (r < 0)
+ return log_error_errno(r, "Failed to add image object vtable: %m");
+
+ r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/machine1/image", image_node_enumerator, m);
+ if (r < 0)
+ return log_error_errno(r, "Failed to add image enumerator: %m");
r = sd_bus_add_match(m->bus,
NULL,
"path='/org/freedesktop/systemd1'",
match_job_removed,
m);
- if (r < 0) {
- log_error_errno(-r, "Failed to add match for JobRemoved: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_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) {
- log_error_errno(-r, "Failed to add match for UnitRemoved: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_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) {
- log_error_errno(-r, "Failed to add match for PropertiesChanged: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_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) {
- log_error_errno(-r, "Failed to add match for Reloading: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add match for Reloading: %m");
r = sd_bus_call_method(
m->bus,
}
r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
- if (r < 0) {
- log_error_errno(-r, "Failed to register name: %m");
- 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_errno(-r, "Failed to attach bus to event loop: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to attach bus to event loop: %m");
return 0;
}
r = manager_startup(m);
if (r < 0) {
- log_error_errno(-r, "Failed to fully start up daemon: %m");
+ log_error_errno(r, "Failed to fully start up daemon: %m");
goto finish;
}