machined: Move image discovery logic into src/shared, so that we can make use of...

[elogind.git] / src / machine / machined.h

diff --git a/src/machine/machined.h b/src/machine/machined.h
index 0b074c4e8a34ac1fa2adcbce438aed0969e5a67e..695ba297cca41ebe42f5e951a28db3a7cd67b8b6 100644 (file)
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -33,6 +33,8 @@
 typedef struct Manager Manager;
 
 #include "machine.h"
 typedef struct Manager Manager;
 
 #include "machine.h"

+#include "machine-dbus.h"
+#include "image-dbus.h"

 
 struct Manager {
         sd_event *event;
 
 struct Manager {
         sd_event *event;


@@ -42,6 +44,8 @@ struct Manager {
         Hashmap *machine_units;
         Hashmap *machine_leaders;
 
         Hashmap *machine_units;
         Hashmap *machine_leaders;
 

+        Hashmap *polkit_registry;
+

         LIST_HEAD(Machine, machine_gc_queue);
 };
 
         LIST_HEAD(Machine, machine_gc_queue);
 };
 


@@ -60,8 +64,6 @@ int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine);
 
 extern const sd_bus_vtable manager_vtable[];
 
 
 extern const sd_bus_vtable manager_vtable[];
 

-int machine_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-

 int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);


@@ -69,6 +71,6 @@ int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_b
 
 int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, sd_bus_message *more_properties, sd_bus_error *error, char **job);
 int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
 
 int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, sd_bus_message *more_properties, sd_bus_error *error, char **job);
 int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);

-int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error);
+int manager_kill_unit(Manager *manager, const char *unit, int signo, sd_bus_error *error);

 int manager_unit_is_active(Manager *manager, const char *unit);
 int manager_job_is_active(Manager *manager, const char *path);
 int manager_unit_is_active(Manager *manager, const char *unit);
 int manager_job_is_active(Manager *manager, const char *path);