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=77a2257e9be8ef91b425af0d0e640196eb5414b4;hb=19c5f19d69bb5f520fa7213239490c55de06d99d;hpb=346bce1f4cff0096177c613987cdc80fa4ec134e diff --git a/src/execute.h b/src/execute.h index 77a2257e9..0d7e7dd65 100644 --- a/src/execute.h +++ b/src/execute.h @@ -40,8 +40,6 @@ struct CGroupAttribute; #include "list.h" #include "util.h" -#define STDOUT_SYSLOG_BRIDGE_SOCKET "/run/systemd/stdout-syslog-bridge" - typedef enum KillMode { KILL_CONTROL_GROUP = 0, KILL_PROCESS, @@ -76,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 @@ -128,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 @@ -163,6 +165,7 @@ struct ExecContext { 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