[systemd-commits] src/core

Lennart Poettering lennart at kemper.freedesktop.org
Tue Aug 21 07:48:57 PDT 2012


 src/core/main.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8b8ffe6828c97c82870cfd30c647fa269964810f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 21 16:47:14 2012 +0200

    core: fix error checking for PR_SET_CHILD_SUBREAPER

diff --git a/src/core/main.c b/src/core/main.c
index cdd77c1..6e8f21a 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1509,11 +1509,11 @@ int main(int argc, char *argv[]) {
 
         if (arg_running_as == MANAGER_USER) {
                 /* Become reaper of our children */
-                r = prctl(PR_SET_CHILD_SUBREAPER, 1);
-                if (r < 0)
-                        log_error("Failed to prctl(PR_SET_CHILD_SUBREAPER): %s", strerror(-r));
-                if (r == -EINVAL)
-                        log_error("Perhaps the kernel version is too old (< 3.4?)");
+                if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) {
+                        log_warning("Failed to make us a subreaper: %m");
+                        if (errno == EINVAL)
+                                log_info("Perhaps the kernel version is too old (< 3.3?)");
+                }
         }
 
         r = manager_new(arg_running_as, &m);



More information about the systemd-commits mailing list