summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-06-05 09:25:43 +0200
committerDaniel Mack <github@zonque.org>2015-06-05 09:25:43 +0200
commita4d9a304f926614f41783e0b5239c99c807da09d (patch)
tree236a14f92d0d518a5e39e648abe6794bebc1f466 /src
parent5e29ba7a5cce2d8479759b60c0079df095d75729 (diff)
parent61b9b203feee1ff7320e0f38d9b4b2a5e1944409 (diff)
Merge pull request #76 from crrodriguez/master
core: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails
Diffstat (limited to 'src')
-rw-r--r--src/core/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 674e47e788..29ccff7b63 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1606,14 +1606,10 @@ int main(int argc, char *argv[]) {
}
}
- if (arg_running_as == MANAGER_USER) {
+ if (arg_running_as == MANAGER_USER)
/* Become reaper of our children */
- if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) {
+ if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
log_warning_errno(errno, "Failed to make us a subreaper: %m");
- if (errno == EINVAL)
- log_info("Perhaps the kernel version is too old (< 3.4?)");
- }
- }
if (arg_running_as == MANAGER_SYSTEM) {
bump_rlimit_nofile(&saved_rlimit_nofile);