summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-12 20:12:15 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-12 20:12:15 +0200
commit90a5f6e42a7422b6033be5d0fe2bf48ea6b91b98 (patch)
tree53114a2f2489ecc8070dffb8eee17b71462fbb5a
parentc59c76cab0f4e654e1f6705f5be02f925970e5ca (diff)
execute: don't fail if we cannot fix OOM in a container
-rw-r--r--TODO2
-rw-r--r--src/execute.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/TODO b/TODO
index 04c3832cb4..98251b2c0a 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 d67916c249..1e376ff89e 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;
}