X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.h;h=445537239cb33b9cb2082084285686b7e853dbf5;hb=b56e57470c92f123044ea690b5404bdd730ddaa6;hp=dd48593d4ce70c6027cc3f3a695bf60bf48bbbea;hpb=d3689161a2870a56ba5a2837daa2ca3463e24710;p=elogind.git

diff --git a/src/manager.h b/src/manager.h
index dd48593d4..445537239 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -140,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;
@@ -201,10 +203,8 @@ struct Manager {
         bool show_status;
         bool confirm_spawn;
         bool sysv_console;
-
-        bool mount_on_plug;
-        bool swap_on_plug;
         bool mount_auto;
+        bool swap_auto;
 
         int n_deserializing;
 };
@@ -239,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);
@@ -253,10 +255,12 @@ 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);
 
+bool manager_unit_pending_inactive(Manager *m, const char *name);
+
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);