chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efi: set a nice description string in the ESP units
[elogind.git]
/
src
/
core
/
execute.c
diff --git
a/src/core/execute.c
b/src/core/execute.c
index 9718e43a707e4920ffcb276c95c936d9f1ba9ed2..1413c9110ee71dccdebb6eddc4d477e215755981 100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-957,7
+957,7
@@
static int apply_seccomp(uint32_t *syscall_filter) {
for (i = 0, n = 0; i < syscall_max(); i++)
if (syscall_filter[i >> 4] & (1 << (i & 31))) {
struct sock_filter item[] = {
for (i = 0, n = 0; i < syscall_max(); i++)
if (syscall_filter[i >> 4] & (1 << (i & 31))) {
struct sock_filter item[] = {
- BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K,
i
, 0, 1),
+ BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K,
INDEX_TO_SYSCALL(i)
, 0, 1),
BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
};
BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
};
@@
-1024,8
+1024,8
@@
int exec_spawn(ExecCommand *command,
r = exec_context_load_environment(context, &files_env);
if (r < 0) {
r = exec_context_load_environment(context, &files_env);
if (r < 0) {
- log_struct(LOG_ERR,
-
"UNIT=%s",
unit_id,
+ log_struct
_unit
(LOG_ERR,
+ unit_id,
"MESSAGE=Failed to load environment files: %s", strerror(-r),
"ERRNO=%d", -r,
NULL);
"MESSAGE=Failed to load environment files: %s", strerror(-r),
"ERRNO=%d", -r,
NULL);
@@
-1039,8
+1039,8
@@
int exec_spawn(ExecCommand *command,
if (!line)
return log_oom();
if (!line)
return log_oom();
- log_struct(LOG_DEBUG,
-
"UNIT=%s",
unit_id,
+ log_struct
_unit
(LOG_DEBUG,
+ unit_id,
"MESSAGE=About to execute %s", line,
NULL);
free(line);
"MESSAGE=About to execute %s", line,
NULL);
free(line);
@@
-1512,8
+1512,8
@@
int exec_spawn(ExecCommand *command,
_exit(r);
}
_exit(r);
}
- log_struct(LOG_DEBUG,
-
"UNIT=%s",
unit_id,
+ log_struct
_unit
(LOG_DEBUG,
+ unit_id,
"MESSAGE=Forked %s as %lu",
command->path, (unsigned long) pid,
NULL);
"MESSAGE=Forked %s as %lu",
command->path, (unsigned long) pid,
NULL);