X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.h;h=4b405d61c1236cf7259be7778c9c59d019794bac;hp=d8559f1bec40a7ccf580215e0929801606ca60a9;hb=cebe0d41e4d5b3fdd9d521116cc029bcb819c90d;hpb=59d1a83370e333e906015a48dc9c1f1a458911f5

diff --git a/src/manager.h b/src/manager.h
index d8559f1be..4b405d61c 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -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 */
@@ -148,7 +148,6 @@ struct Manager {
         dual_timestamp startup_timestamp;
         dual_timestamp finish_timestamp;
 
-        char *console;
         char *generator_unit_path;
 
         /* Data specific to the device subsystem */
@@ -195,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;
 
@@ -212,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
@@ -220,6 +221,8 @@ struct Manager {
         bool mount_auto;
         bool swap_auto;
 
+        ExecOutput default_std_output, default_std_error;
+
         int n_deserializing;
 
         unsigned n_installed_jobs;
@@ -256,7 +259,6 @@ 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);
@@ -285,6 +287,8 @@ 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);