X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fmanager.h;h=77c20764972312ef951a9efa0bca473b0cc5eccc;hb=7b2603e646fbd456756dd91fbc05ef85edc74aaf;hp=c1f787f8544dba1d836be096e83e59fc4c6c6995;hpb=4927fcae48de061393b3ce9c12d49f80d73fbf1d;p=elogind.git

diff --git a/src/manager.h b/src/manager.h
index c1f787f85..77c207649 100644
--- 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. */
@@ -142,6 +140,8 @@ struct Manager {
 
         dual_timestamp startup_timestamp;
 
+        char *console;
+
         /* Data specific to the device subsystem */
         struct udev* udev;
         struct udev_monitor* udev_monitor;
@@ -170,6 +170,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 +200,13 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
-        int n_deserializing;
-
         bool show_status;
         bool confirm_spawn;
         bool sysv_console;
+        bool mount_auto;
+        bool swap_auto;
+
+        int n_deserializing;
 };
 
 int manager_new(ManagerRunningAs running_as, Manager **m);
@@ -235,6 +239,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,7 +255,7 @@ 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);