chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
machine
/
machined.c
diff --git
a/src/machine/machined.c
b/src/machine/machined.c
index c5c20abf0c508c1d5a3ed59c69d0a62b4c038c73..f91f0671356b19f8acf4d5d5d6c23fdcc5a50581 100644
(file)
--- a/
src/machine/machined.c
+++ b/
src/machine/machined.c
@@
-20,20
+20,15
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <pwd.h>
-#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include <sys/epoll.h>
#include "sd-daemon.h"
#include "sd-daemon.h"
-#include "strv.h"
-#include "conf-parser.h"
#include "cgroup-util.h"
#include "cgroup-util.h"
-#include "mkdir.h"
#include "bus-util.h"
#include "bus-error.h"
#include "label.h"
#include "bus-util.h"
#include "bus-error.h"
#include "label.h"
+#include "machine-image.h"
#include "machined.h"
Manager *manager_new(void) {
#include "machined.h"
Manager *manager_new(void) {
@@
-66,6
+61,7
@@
Manager *manager_new(void) {
void manager_free(Manager *m) {
Machine *machine;
void manager_free(Manager *m) {
Machine *machine;
+ Image *i;
assert(m);
assert(m);
@@
-76,6
+72,13
@@
void manager_free(Manager *m) {
hashmap_free(m->machine_units);
hashmap_free(m->machine_leaders);
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);
bus_verify_polkit_async_registry_free(m->polkit_registry);
sd_bus_unref(m->bus);
@@
-316,6
+319,8
@@
int main(int argc, char *argv[]) {
* check stays in. */
mkdir_label("/run/systemd/machines", 0755);
* 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();
m = manager_new();
if (!m) {
r = log_oom();