swap: major rework, use /sbin/swapon for setting up swaps, fix merging of aliased...

[elogind.git] / src / manager.h

diff --git a/src/manager.h b/src/manager.h
index dd48593d4ce70c6027cc3f3a695bf60bf48bbbea..15ffb2c1a5baa403a16aa5106be2fe6c8da54f44 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -139,6 +139,9 @@ struct Manager {
         char **environment;
 
         dual_timestamp startup_timestamp;
+        dual_timestamp finish_timestamp;
+
+        char *console;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -152,6 +155,8 @@ struct Manager {
 
         /* Data specific to the swap filesystem */
         FILE *proc_swaps;
+        Hashmap *swaps_by_proc_swaps;
+        bool request_reload;
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;
@@ -200,13 +205,16 @@ struct Manager {
 
         bool show_status;
         bool confirm_spawn;
+#ifdef HAVE_SYSV_COMPAT
         bool sysv_console;
-
-        bool mount_on_plug;
-        bool swap_on_plug;
+#endif
         bool mount_auto;
+        bool swap_auto;
 
         int n_deserializing;
+
+        unsigned n_installed_jobs;
+        unsigned n_failed_jobs;
 };
 
 int manager_new(ManagerRunningAs running_as, Manager **m);
@@ -239,6 +247,8 @@ unsigned manager_dispatch_load_queue(Manager *m);
 unsigned manager_dispatch_run_queue(Manager *m);
 unsigned manager_dispatch_dbus_queue(Manager *m);
 
+int manager_set_console(Manager *m, const char *console);
+
 int manager_loop(Manager *m);
 
 void manager_dispatch_bus_name_owner_changed(Manager *m, const char *name, const char* old_owner, const char *new_owner);
@@ -253,9 +263,14 @@ int manager_reload(Manager *m);
 
 bool manager_is_booting_or_shutting_down(Manager *m);
 
-void manager_reset_maintenance(Manager *m);
+void manager_reset_failed(Manager *m);
 
 void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
+void manager_send_unit_plymouth(Manager *m, Unit *u);
+
+bool manager_unit_pending_inactive(Manager *m, const char *name);
+
+void manager_check_finished(Manager *m);
 
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);