chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: introduce IgnoreOnIsolate flag so that we can keep systemd-logger around...
[elogind.git]
/
src
/
execute.c
diff --git
a/src/execute.c
b/src/execute.c
index b7ae522692f452f23b9107255e76aec5d07ac47d..1e376ff89e08beacdf46aa344e3a2128f9bde6ac 100644
(file)
--- a/
src/execute.c
+++ b/
src/execute.c
@@
-981,7
+981,7
@@
int exec_spawn(ExecCommand *command,
/* This string must fit in 10 chars (i.e. the length
* of "/sbin/init") */
/* This string must fit in 10 chars (i.e. the length
* of "/sbin/init") */
- rename_process("sd
:
exec");
+ rename_process("sd
.
exec");
/* We reset exactly these signals, since they are the
* only ones we set to SIG_IGN in the main daemon. All
/* We reset exactly these signals, since they are the
* only ones we set to SIG_IGN in the main daemon. All
@@
-1106,7
+1106,8
@@
int exec_spawn(ExecCommand *command,
snprintf(t, sizeof(t), "%i", adj);
char_array_0(t);
snprintf(t, sizeof(t), "%i", adj);
char_array_0(t);
- if (write_one_line_file("/proc/self/oom_adj", t) < 0) {
+ if (write_one_line_file("/proc/self/oom_adj", t) < 0
+ && errno != EACCES) {
r = EXIT_OOM_ADJUST;
goto fail_child;
}
r = EXIT_OOM_ADJUST;
goto fail_child;
}
@@
-1650,7
+1651,7
@@
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
fprintf(f,
"%sSyslogFacility: %s\n"
"%sSyslogLevel: %s\n",
fprintf(f,
"%sSyslogFacility: %s\n"
"%sSyslogLevel: %s\n",
- prefix, log_facility_
to_string(LOG_FAC(c->syslog_priority)
),
+ prefix, log_facility_
unshifted_to_string(c->syslog_priority >> 3
),
prefix, log_level_to_string(LOG_PRI(c->syslog_priority)));
if (c->capabilities) {
prefix, log_level_to_string(LOG_PRI(c->syslog_priority)));
if (c->capabilities) {