chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: don't hit an assert if a service unit changes type and we get a spurious...
[elogind.git]
/
src
/
core
/
execute.h
diff --git
a/src/core/execute.h
b/src/core/execute.h
index 428bb7c9bfe0530ef39190f14351d5715841e109..2bcd2e1e6cf7e584111d73f22826743dc719904e 100644
(file)
--- a/
src/core/execute.h
+++ b/
src/core/execute.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooexecutehfoo
-#define fooexecutehfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-40,22
+39,6
@@
struct CGroupAttribute;
#include "list.h"
#include "util.h"
#include "list.h"
#include "util.h"
-typedef enum KillMode {
- KILL_CONTROL_GROUP = 0,
- KILL_PROCESS,
- KILL_NONE,
- _KILL_MODE_MAX,
- _KILL_MODE_INVALID = -1
-} KillMode;
-
-typedef enum KillWho {
- KILL_MAIN,
- KILL_CONTROL,
- KILL_ALL,
- _KILL_WHO_MAX,
- _KILL_WHO_INVALID = -1
-} KillWho;
-
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
typedef enum ExecInput {
EXEC_INPUT_NULL,
EXEC_INPUT_TTY,
@@
-118,7
+101,7
@@
struct ExecContext {
ExecOutput std_output;
ExecOutput std_error;
ExecOutput std_output;
ExecOutput std_error;
-
unsigned long
timer_slack_nsec;
+
nsec_t
timer_slack_nsec;
char *tcpwrap_name;
char *tcpwrap_name;
@@
-147,11
+130,6
@@
struct ExecContext {
uint64_t capability_bounding_set_drop;
uint64_t capability_bounding_set_drop;
- /* Not relevant for spawning processes, just for killing */
- KillMode kill_mode;
- int kill_signal;
- bool send_sigkill;
-
cap_t capabilities;
int secure_bits;
cap_t capabilities;
int secure_bits;
@@
-164,6
+142,8
@@
struct ExecContext {
bool private_tmp;
bool private_network;
bool private_tmp;
bool private_network;
+ bool no_new_privileges;
+
bool control_group_modify;
int control_group_persistent;
bool control_group_modify;
int control_group_persistent;
@@
-174,11
+154,12
@@
struct ExecContext {
* don't enter a trigger loop. */
bool same_pgrp;
* don't enter a trigger loop. */
bool same_pgrp;
+ uint32_t *syscall_filter;
+
bool oom_score_adjust_set:1;
bool nice_set:1;
bool ioprio_set:1;
bool cpu_sched_set:1;
bool oom_score_adjust_set:1;
bool nice_set:1;
bool ioprio_set:1;
bool cpu_sched_set:1;
- bool timer_slack_nsec_set:1;
};
int exec_spawn(ExecCommand *command,
};
int exec_spawn(ExecCommand *command,
@@
-193,6
+174,8
@@
int exec_spawn(ExecCommand *command,
struct CGroupBonding *cgroup_bondings,
struct CGroupAttribute *cgroup_attributes,
const char *cgroup_suffix,
struct CGroupBonding *cgroup_bondings,
struct CGroupAttribute *cgroup_attributes,
const char *cgroup_suffix,
+ const char *unit_id,
+ int pipe_fd[2],
pid_t *ret);
void exec_command_done(ExecCommand *c);
pid_t *ret);
void exec_command_done(ExecCommand *c);
@@
-224,11
+207,3
@@
ExecOutput exec_output_from_string(const char *s);
const char* exec_input_to_string(ExecInput i);
ExecInput exec_input_from_string(const char *s);
const char* exec_input_to_string(ExecInput i);
ExecInput exec_input_from_string(const char *s);
-
-const char *kill_mode_to_string(KillMode k);
-KillMode kill_mode_from_string(const char *s);
-
-const char *kill_who_to_string(KillWho k);
-KillWho kill_who_from_string(const char *s);
-
-#endif