diff options
author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2019-07-10 14:13:53 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-16 12:17:18 +0100 |
commit | 289a29fc687d1224097f553a6f8c7f1baf903cae (patch) | |
tree | aff65c750805285cd0673b1cc12598bdbc12f38d /meta/recipes-core/systemd | |
parent | 97e1af51814c63963dc6eee003e0cf0e4dead024 (diff) | |
download | openembedded-core-contrib-289a29fc687d1224097f553a6f8c7f1baf903cae.tar.gz |
systemd: backport patch to fix sysctl warning on boot
Due to improved validation of sysctl settings in recent kernels (5.2+, but
also stable kernels like 4.19.53), systemd will log an error message like
systemd[1]: Failed to bump fs.file-max, ignoring: Invalid argument
during boot. Backport the bugfix from the systemd master.
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch | 39 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch b/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch new file mode 100644 index 0000000000..ff64f58c9c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch @@ -0,0 +1,39 @@ +From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Mon, 17 Jun 2019 10:51:25 +0200 +Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than + ULONG_MAX + +Since kernel 5.2 the kernel thankfully returns proper errors when we +write a value out of range to the sysctl. Which however breaks writing +ULONG_MAX to request the maximum value. Hence let's write the new +maximum value instead, LONG_MAX. + +/cc @brauner + +Fixes: #12803 + +Upstream-Status: Backport + +Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com> +--- + src/core/main.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/core/main.c b/src/core/main.c +index b33ea1b5b5..e7f51815f0 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) { + #endif + + #if BUMP_PROC_SYS_FS_FILE_MAX +- /* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as glibc/gcc define that as +- * "(0x7fffffffffffffffL * 2UL + 1UL)". Seriously. 😢 */ +- if (asprintf(&t, "%lu\n", ULONG_MAX) < 0) { ++ /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously thing where ++ * different but the operation would fail silently.) */ ++ if (asprintf(&t, "%li\n", LONG_MAX) < 0) { + log_oom(); + return; + } diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 29f64b995a..ca083ad376 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb @@ -25,6 +25,7 @@ SRC_URI += "file://touchscreen.rules \ file://0006-network-remove-redunant-link-name-in-message.patch \ file://99-default.preset \ file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \ + file://0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch \ " # patches needed by musl |