chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: move status further down
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index d7239d544000f40f8073d3c9c25e3263d26c0a8e..0c2526b33e1423b35a834db1553d49be468aa0b3 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-232,7
+232,10
@@
static bool is_terminal_input(ExecInput i) {
i == EXEC_INPUT_TTY_FAIL;
}
i == EXEC_INPUT_TTY_FAIL;
}
-static int fixup_input(ExecInput std_input, int socket_fd) {
+static int fixup_input(ExecInput std_input, int socket_fd, bool apply_tty_stdin) {
+
+ if (is_terminal_input(std_input) && !apply_tty_stdin)
+ return EXEC_INPUT_NULL;
if (std_input == EXEC_INPUT_SOCKET && socket_fd < 0)
return EXEC_INPUT_NULL;
if (std_input == EXEC_INPUT_SOCKET && socket_fd < 0)
return EXEC_INPUT_NULL;
@@
-248,12
+251,12
@@
static int fixup_output(ExecOutput std_output, int socket_fd) {
return std_output;
}
return std_output;
}
-static int setup_input(const ExecContext *context, int socket_fd) {
+static int setup_input(const ExecContext *context, int socket_fd
, bool apply_tty_stdin
) {
ExecInput i;
assert(context);
ExecInput i;
assert(context);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
switch (i) {
switch (i) {
@@
-289,14
+292,14
@@
static int setup_input(const ExecContext *context, int socket_fd) {
}
}
}
}
-static int setup_output(const ExecContext *context, int socket_fd, const char *ident) {
+static int setup_output(const ExecContext *context, int socket_fd, const char *ident
, bool apply_tty_stdin
) {
ExecOutput o;
ExecInput i;
assert(context);
assert(ident);
ExecOutput o;
ExecInput i;
assert(context);
assert(ident);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
o = fixup_output(context->std_output, socket_fd);
/* This expects the input is already set up */
o = fixup_output(context->std_output, socket_fd);
/* This expects the input is already set up */
@@
-339,14
+342,14
@@
static int setup_output(const ExecContext *context, int socket_fd, const char *i
}
}
}
}
-static int setup_error(const ExecContext *context, int socket_fd, const char *ident) {
+static int setup_error(const ExecContext *context, int socket_fd, const char *ident
, bool apply_tty_stdin
) {
ExecOutput o, e;
ExecInput i;
assert(context);
assert(ident);
ExecOutput o, e;
ExecInput i;
assert(context);
assert(ident);
- i = fixup_input(context->std_input, socket_fd);
+ i = fixup_input(context->std_input, socket_fd
, apply_tty_stdin
);
o = fixup_output(context->std_output, socket_fd);
e = fixup_output(context->std_error, socket_fd);
o = fixup_output(context->std_output, socket_fd);
e = fixup_output(context->std_error, socket_fd);
@@
-889,6
+892,7
@@
int exec_spawn(ExecCommand *command,
char **environment,
bool apply_permissions,
bool apply_chroot,
char **environment,
bool apply_permissions,
bool apply_chroot,
+ bool apply_tty_stdin,
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
pid_t *ret) {
bool confirm_spawn,
CGroupBonding *cgroup_bondings,
pid_t *ret) {
@@
-939,7
+943,7
@@
int exec_spawn(ExecCommand *command,
const char *username = NULL, *home = NULL;
uid_t uid = (uid_t) -1;
gid_t gid = (gid_t) -1;
const char *username = NULL, *home = NULL;
uid_t uid = (uid_t) -1;
gid_t gid = (gid_t) -1;
- char **our_env = NULL, **pam_env = NULL, **final_env = NULL;
+ char **our_env = NULL, **pam_env = NULL, **final_env = NULL
, **final_argv = NULL
;
unsigned n_env = 0;
int saved_stdout = -1, saved_stdin = -1;
bool keep_stdout = false, keep_stdin = false;
unsigned n_env = 0;
int saved_stdout = -1, saved_stdin = -1;
bool keep_stdout = false, keep_stdin = false;
@@
-985,7
+989,9
@@
int exec_spawn(ExecCommand *command,
}
}
}
}
- if (confirm_spawn) {
+ /* We skip the confirmation step if we shall not apply the TTY */
+ if (confirm_spawn &&
+ (!is_terminal_input(context->std_input) || apply_tty_stdin)) {
char response;
/* Set up terminal for the question */
char response;
/* Set up terminal for the question */
@@
-1018,18
+1024,18
@@
int exec_spawn(ExecCommand *command,
}
if (!keep_stdin)
}
if (!keep_stdin)
- if (setup_input(context, socket_fd) < 0) {
+ if (setup_input(context, socket_fd
, apply_tty_stdin
) < 0) {
r = EXIT_STDIN;
goto fail;
}
if (!keep_stdout)
r = EXIT_STDIN;
goto fail;
}
if (!keep_stdout)
- if (setup_output(context, socket_fd, file_name_from_path(command->path)) < 0) {
+ if (setup_output(context, socket_fd, file_name_from_path(command->path)
, apply_tty_stdin
) < 0) {
r = EXIT_STDOUT;
goto fail;
}
r = EXIT_STDOUT;
goto fail;
}
- if (setup_error(context, socket_fd, file_name_from_path(command->path)) < 0) {
+ if (setup_error(context, socket_fd, file_name_from_path(command->path)
, apply_tty_stdin
) < 0) {
r = EXIT_STDERR;
goto fail;
}
r = EXIT_STDERR;
goto fail;
}
@@
-1254,13
+1260,19
@@
int exec_spawn(ExecCommand *command,
goto fail;
}
goto fail;
}
- execve(command->path, argv, final_env);
+ if (!(final_argv = replace_env_argv(argv, final_env))) {
+ r = EXIT_MEMORY;
+ goto fail;
+ }
+
+ execve(command->path, final_argv, final_env);
r = EXIT_EXEC;
fail:
strv_free(our_env);
strv_free(final_env);
strv_free(pam_env);
r = EXIT_EXEC;
fail:
strv_free(our_env);
strv_free(final_env);
strv_free(pam_env);
+ strv_free(final_argv);
if (saved_stdin >= 0)
close_nointr_nofail(saved_stdin);
if (saved_stdin >= 0)
close_nointr_nofail(saved_stdin);
@@
-1296,6
+1308,7
@@
void exec_context_init(ExecContext *c) {
c->syslog_priority = LOG_DAEMON|LOG_INFO;
c->syslog_level_prefix = true;
c->mount_flags = MS_SHARED;
c->syslog_priority = LOG_DAEMON|LOG_INFO;
c->syslog_level_prefix = true;
c->mount_flags = MS_SHARED;
+ c->kill_signal = SIGTERM;
}
void exec_context_done(ExecContext *c) {
}
void exec_context_done(ExecContext *c) {
@@
-1559,6
+1572,12
@@
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
strv_fprintf(f, c->inaccessible_dirs);
fputs("\n", f);
}
strv_fprintf(f, c->inaccessible_dirs);
fputs("\n", f);
}
+
+ fprintf(f,
+ "%sKillMode: %s\n"
+ "%sKillSignal: SIG%s\n",
+ prefix, kill_mode_to_string(c->kill_mode),
+ prefix, signal_to_string(c->kill_signal));
}
void exec_status_start(ExecStatus *s, pid_t pid) {
}
void exec_status_start(ExecStatus *s, pid_t pid) {