diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch | 40 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.31.1.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch b/meta/recipes-core/busybox/busybox/0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch new file mode 100644 index 0000000000..9f58eaef67 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 3bee0460d74bad88eca6592e63ca926961b43b67 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Fri, 6 Mar 2020 16:09:26 +0800 | ||
4 | Subject: [PATCH] sysctl: ignore EIO of stable_secret below | ||
5 | /proc/sys/net/ipv6/conf | ||
6 | |||
7 | Avoid confusing messages caused by EIO on reading | ||
8 | /proc/sys/net/ipv6/conf/*/stable_secret if those are not set yet. | ||
9 | Make it behave the same as procps(>=3.3.13). | ||
10 | |||
11 | Upstream-Status: Submitted [busybox@busybox.net mailing list] | ||
12 | |||
13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
14 | --- | ||
15 | procps/sysctl.c | 9 ++++++++- | ||
16 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/procps/sysctl.c b/procps/sysctl.c | ||
19 | index 6d77185ca..42c51cc91 100644 | ||
20 | --- a/procps/sysctl.c | ||
21 | +++ b/procps/sysctl.c | ||
22 | @@ -202,7 +202,14 @@ static int sysctl_act_on_setting(char *setting) | ||
23 | value = cptr = xmalloc_read(fd, NULL); | ||
24 | close(fd); | ||
25 | if (value == NULL) { | ||
26 | - bb_perror_msg("error reading key '%s'", outname); | ||
27 | + switch (errno) { | ||
28 | + case EIO: | ||
29 | + /* Ignore stable_secret below /proc/sys/net/ipv6/conf */ | ||
30 | + break; | ||
31 | + default: | ||
32 | + bb_perror_msg("error reading key '%s'", outname); | ||
33 | + break; | ||
34 | + } | ||
35 | retval = EXIT_FAILURE; | ||
36 | goto end; | ||
37 | } | ||
38 | -- | ||
39 | 2.17.1 | ||
40 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb b/meta/recipes-core/busybox/busybox_1.31.1.bb index ec5b580442..2bb1d59ba7 100644 --- a/meta/recipes-core/busybox/busybox_1.31.1.bb +++ b/meta/recipes-core/busybox/busybox_1.31.1.bb | |||
@@ -47,6 +47,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
47 | file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ | 47 | file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \ |
48 | file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ | 48 | file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \ |
49 | file://0001-Remove-stime-function-calls.patch \ | 49 | file://0001-Remove-stime-function-calls.patch \ |
50 | file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ | ||
50 | " | 51 | " |
51 | SRC_URI_append_libc-musl = " file://musl.cfg " | 52 | SRC_URI_append_libc-musl = " file://musl.cfg " |
52 | 53 | ||