X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.h;h=6e7558e17558c3b69034671ee045f8229d0b6cf9;hb=e6960940b6dc5ab81eb2fca4061c333e1795f38d;hp=c183e105af9b30a48dd748f7b79ef38f0708d0f5;hpb=f1dd0c3f9b4a257e81ff9c6a08070c702a0db45a;p=elogind.git

diff --git a/src/manager.h b/src/manager.h
index c183e105a..6e7558e17 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -102,7 +102,7 @@ struct Manager {
 
         /* To make it easy to iterate through the units of a specific
          * type we maintain a per type linked list */
-        LIST_HEAD(Meta, units_per_type[_UNIT_TYPE_MAX]);
+        LIST_HEAD(Meta, units_by_type[_UNIT_TYPE_MAX]);
 
         /* Units that need to be loaded */
         LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
@@ -179,6 +179,7 @@ struct Manager {
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;
+        int32_t conn_data_slot;
         int32_t subscribed_data_slot;
 
         uint32_t current_job_id;
@@ -211,6 +212,8 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
+        bool taint_usr:1;
+
         bool show_status;
         bool confirm_spawn;
 #ifdef HAVE_SYSV_COMPAT
@@ -221,7 +224,8 @@ struct Manager {
 
         ExecOutput default_std_output, default_std_error;
 
-        int n_deserializing;
+        /* non-zero if we are reloading or reexecuting, */
+        int n_reloading;
 
         unsigned n_installed_jobs;
         unsigned n_failed_jobs;
@@ -287,6 +291,9 @@ void manager_undo_generators(Manager *m);
 
 void manager_recheck_syslog(Manager *m);
 
+void manager_set_show_status(Manager *m, bool b);
+bool manager_get_show_status(Manager *m);
+
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);