X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fexecute.h;h=0d7e7dd65db1feb8727c5d5137519da1644b5741;hp=a2d9072357702e2eb25872e6e185947d9aef442f;hb=3e2147858f21943d5f4a781c60f33ac22c6096ed;hpb=64747e2d4b6feb61e9f9e70d36ffcf5a972e168a

diff --git a/src/execute.h b/src/execute.h
index a2d907235..0d7e7dd65 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -35,12 +35,11 @@ typedef struct ExecContext ExecContext;
 #include <sched.h>
 
 struct CGroupBonding;
+struct CGroupAttribute;
 
 #include "list.h"
 #include "util.h"
 
-#define LOGGER_SOCKET "/run/systemd/logger"
-
 typedef enum KillMode {
         KILL_CONTROL_GROUP = 0,
         KILL_PROCESS,
@@ -75,6 +74,8 @@ typedef enum ExecOutput {
         EXEC_OUTPUT_SYSLOG_AND_CONSOLE,
         EXEC_OUTPUT_KMSG,
         EXEC_OUTPUT_KMSG_AND_CONSOLE,
+        EXEC_OUTPUT_JOURNAL,
+        EXEC_OUTPUT_JOURNAL_AND_CONSOLE,
         EXEC_OUTPUT_SOCKET,
         _EXEC_OUTPUT_MAX,
         _EXEC_OUTPUT_INVALID = -1
@@ -127,6 +128,8 @@ struct ExecContext {
         bool tty_vhangup;
         bool tty_vt_disallocate;
 
+        bool ignore_sigpipe;
+
         /* Since resolving these names might might involve socket
          * connections and we don't want to deadlock ourselves these
          * names are resolved on execution only and in the child
@@ -159,8 +162,10 @@ struct ExecContext {
         bool cpu_sched_reset_on_fork;
         bool non_blocking;
         bool private_tmp;
+        bool private_network;
 
         bool control_group_modify;
+        int control_group_persistent;
 
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
@@ -186,6 +191,7 @@ int exec_spawn(ExecCommand *command,
                bool apply_tty_stdin,
                bool confirm_spawn,
                struct CGroupBonding *cgroup_bondings,
+               struct CGroupAttribute *cgroup_attributes,
                pid_t *ret);
 
 void exec_command_done(ExecCommand *c);