From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Apr 2011 18:12:15 +0000 (+0200)
Subject: execute: don't fail if we cannot fix OOM in a container
X-Git-Tag: v25~66
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=90a5f6e42a7422b6033be5d0fe2bf48ea6b91b98

execute: don't fail if we cannot fix OOM in a container
---

diff --git a/TODO b/TODO
index 04c3832cb..98251b2c0 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@ F15:
 
 * get writev() /dev/kmsg support into the F15 kernel
 
+* fix sd_is_socket() invocation in dbus
+
 Features:
 
 * fix alsa mixer restore to not print error when no config is stored
diff --git a/src/execute.c b/src/execute.c
index d67916c24..1e376ff89 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -1106,7 +1106,8 @@ int exec_spawn(ExecCommand *command,
                                 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;
                                 }