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 c1f787f8544dba1d836be096e83e59fc4c6c6995..15ffb2c1a5baa403a16aa5106be2fe6c8da54f44 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomanagerhfoo
 #define foomanagerhfoo
@@ -87,8 +87,6 @@ struct Watch {
 #include "path-lookup.h"
 
 struct Manager {
-        uint32_t current_job_id;
-
         /* Note that the set of units we know of is allowed to be
          * incosistent. However the subset of it that is loaded may
          * not, and the list of jobs may neither. */
@@ -141,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;
@@ -154,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;
@@ -170,6 +173,8 @@ struct Manager {
         int32_t name_data_slot;
         int32_t subscribed_data_slot;
 
+        uint32_t current_job_id;
+
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
@@ -198,11 +203,18 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
-        int n_deserializing;
-
         bool show_status;
         bool confirm_spawn;
+#ifdef HAVE_SYSV_COMPAT
         bool sysv_console;
+#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);
@@ -235,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);
@@ -249,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);