X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachined.c;h=f91f0671356b19f8acf4d5d5d6c23fdcc5a50581;hb=4cee5eede280b7fd48c18a1942616c4ac896a554;hp=966475b2429680bbf65c0a7e7acbcc8b48af5bb3;hpb=c34255bdb217c2a1d3ac6348252437ab8be9ca46;p=elogind.git diff --git a/src/machine/machined.c b/src/machine/machined.c index 966475b24..f91f06713 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -20,22 +20,16 @@ ***/ #include -#include -#include #include #include -#include #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; @@ -67,6 +61,7 @@ Manager *manager_new(void) { void manager_free(Manager *m) { Machine *machine; + Image *i; assert(m); @@ -77,6 +72,15 @@ void manager_free(Manager *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); @@ -96,7 +100,7 @@ int manager_enumerate_machines(Manager *m) { 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; } @@ -113,7 +117,7 @@ int manager_enumerate_machines(Manager *m) { k = manager_add_machine(m, de->d_name, &machine); if (k < 0) { - log_error("Failed to add machine by file name %s: %s", de->d_name, strerror(-k)); + log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name); r = k; continue; @@ -137,28 +141,28 @@ 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/machine1", "org.freedesktop.machine1.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"); 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("Failed to add machine object vtable: %s", strerror(-r)); - 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("Failed to add machine enumerator: %s", strerror(-r)); - 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, @@ -169,10 +173,8 @@ static int manager_connect_bus(Manager *m) { "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) + return log_error_errno(r, "Failed to add match for JobRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -183,10 +185,8 @@ static int manager_connect_bus(Manager *m) { "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) + return log_error_errno(r, "Failed to add match for UnitRemoved: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -196,10 +196,8 @@ static int manager_connect_bus(Manager *m) { "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) + return log_error_errno(r, "Failed to add match for PropertiesChanged: %m"); r = sd_bus_add_match(m->bus, NULL, @@ -210,10 +208,8 @@ static int manager_connect_bus(Manager *m) { "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) + return log_error_errno(r, "Failed to add match for Reloading: %m"); r = sd_bus_call_method( m->bus, @@ -229,16 +225,12 @@ static int manager_connect_bus(Manager *m) { } r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 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; } @@ -327,6 +319,8 @@ int main(int argc, char *argv[]) { * check stays in. */ mkdir_label("/run/systemd/machines", 0755); + assert_se(sigprocmask_many(SIG_BLOCK, SIGCHLD, -1) >= 0); + m = manager_new(); if (!m) { r = log_oom(); @@ -335,7 +329,7 @@ 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; }