picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: make EPERM errors when applying OOM adjustment for forked processes non-fatal 

This should be useful for user namespaces.
This commit is contained in:
Lennart Poettering 2015-01-08 23:12:16 +01:00
parent f7621db0e3
commit d5243d6286
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/execute.c
View File

@ -1406,12 +1406,16 @@ static int exec_child(ExecCommand *command,
}
if (context->oom_score_adjust_set) {
char t[16];
char t[DECIMAL_STR_MAX(context->oom_score_adjust)];
snprintf(t, sizeof(t), "%i", context->oom_score_adjust);
char_array_0(t);
/* When we can't make this change due to EPERM, then
* let's silently skip over it. User namespaces
* prohibit write access to this file, and we
* shouldn't trip up over that. */
if (write_string_file("/proc/self/oom_score_adj", t) < 0) {
sprintf(t, "%i", context->oom_score_adjust);
err = write_string_file("/proc/self/oom_score_adj", t);
if (err < 0 && err != -EPERM) {
*error = EXIT_OOM_ADJUST;
return -errno;
}