X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.h;h=07b92c8e4e94f329af3c2f6cfef494e450e0ae6e;hb=1bd8b8184ee3bc7fc023d6d6dfb2ca99fb6612f3;hp=ab7f26368c2e8f031700831cb03bc3bd4b6f7e1b;hpb=e9ddabc246ced239cbce436e16792dc4c3d1b52d;p=elogind.git

diff --git a/src/manager.h b/src/manager.h
index ab7f26368..07b92c8e4 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -30,7 +30,7 @@
 #include "fdset.h"
 
 /* Enforce upper limit how many names we allow */
-#define MANAGER_MAX_NAMES 2048
+#define MANAGER_MAX_NAMES 131072 /* 128K */
 
 typedef struct Manager Manager;
 typedef enum WatchType WatchType;
@@ -51,7 +51,7 @@ typedef enum ManagerExitCode {
 
 typedef enum ManagerRunningAs {
         MANAGER_SYSTEM,
-        MANAGER_SESSION,
+        MANAGER_USER,
         _MANAGER_RUNNING_AS_MAX,
         _MANAGER_RUNNING_AS_INVALID = -1
 } ManagerRunningAs;
@@ -93,7 +93,7 @@ struct Watch {
 
 struct Manager {
         /* Note that the set of units we know of is allowed to be
-         * incosistent. However the subset of it that is loaded may
+         * inconsistent. However the subset of it that is loaded may
          * not, and the list of jobs may neither. */
 
         /* Active jobs and units */
@@ -142,12 +142,13 @@ struct Manager {
         Set *unit_path_cache;
 
         char **environment;
+        char **default_controllers;
 
         dual_timestamp initrd_timestamp;
         dual_timestamp startup_timestamp;
         dual_timestamp finish_timestamp;
 
-        char *console;
+        char *generator_unit_path;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -193,7 +194,7 @@ struct Manager {
         int gc_marker;
         unsigned n_in_gc_queue;
 
-        /* Make sure the user cannot accidentaly unmount our cgroup
+        /* Make sure the user cannot accidentally unmount our cgroup
          * file system */
         int pin_cgroupfs_fd;
 
@@ -210,6 +211,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
@@ -218,6 +221,9 @@ struct Manager {
         bool mount_auto;
         bool swap_auto;
 
+        ExecOutput default_std_output, default_std_error;
+
+        int n_serializing;
         int n_deserializing;
 
         unsigned n_installed_jobs;
@@ -254,7 +260,7 @@ 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_set_default_controllers(Manager *m, char **controllers);
 
 int manager_loop(Manager *m);
 
@@ -279,6 +285,11 @@ bool manager_unit_pending_inactive(Manager *m, const char *name);
 
 void manager_check_finished(Manager *m);
 
+void manager_run_generators(Manager *m);
+void manager_undo_generators(Manager *m);
+
+void manager_recheck_syslog(Manager *m);
+
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);