summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2018-07-03 16:26:00 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-19 10:53:52 +0100
commit5a1a699415f8c94700bf4306e3c6bdf61fcba5a7 (patch)
tree41ff025a31e639f3fdd411fc48e20dbdd5dbc17b /meta
parent66f380e4b08a8b48c76ffad16eefc944a50eea61 (diff)
downloadpoky-5a1a699415f8c94700bf4306e3c6bdf61fcba5a7.tar.gz
busybox: Add patch to ignore -c on umount command
Fix error when umounting filesystem on shutdown with a systemd distro. See more datails here: [https://github.com/systemd/systemd/issues/7786] (From OE-Core rev: ae23367c85d1a6c84c25736ac3c9a059acbc8dbe) (From OE-Core rev: 29b1555481a30f9a7eda43f67f3e8ceb5da1b0aa) (From OE-Core rev: b233c8db7635250c59c02598308b0ea54580f4d0) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox/umount-ignore-c.patch40
-rw-r--r--meta/recipes-core/busybox/busybox_1.27.2.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/umount-ignore-c.patch b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
new file mode 100644
index 0000000000..9fe7998df3
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
@@ -0,0 +1,40 @@
1Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=426134128112738c97a665170b21153ef0764b7d]
3
4From 95ea12791c8623bf825bc711ac7790306e7e1adb Mon Sep 17 00:00:00 2001
5From: Shawn Landden <slandden@gmail.com>
6Date: Mon, 8 Jan 2018 13:31:58 +0100
7Subject: [PATCH] umount: ignore -c
8Organization: O.S. Systems Software LTDA.
9
10"-c, --no-canonicalize: Do not canonicalize paths."
11
12As busybox doesn't canonicalize paths in the first place it is safe to ignore
13this option.
14
15See https://github.com/systemd/systemd/issues/7786
16
17Signed-off-by: Shawn Landden <slandden@gmail.com>
18Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
19---
20 util-linux/umount.c | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/util-linux/umount.c b/util-linux/umount.c
24index 0c50dc9ee..0425c5b76 100644
25--- a/util-linux/umount.c
26+++ b/util-linux/umount.c
27@@ -68,8 +68,8 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
28 }
29 #endif
30
31-/* ignored: -v -t -i */
32-#define OPTION_STRING "fldnra" "vt:i"
33+/* ignored: -c -v -t -i */
34+#define OPTION_STRING "fldnra" "cvt:i"
35 #define OPT_FORCE (1 << 0) // Same as MNT_FORCE
36 #define OPT_LAZY (1 << 1) // Same as MNT_DETACH
37 #define OPT_FREELOOP (1 << 2)
38--
392.18.0
40
diff --git a/meta/recipes-core/busybox/busybox_1.27.2.bb b/meta/recipes-core/busybox/busybox_1.27.2.bb
index 92678701fc..1ce4823d47 100644
--- a/meta/recipes-core/busybox/busybox_1.27.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.27.2.bb
@@ -46,6 +46,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
46 file://CVE-2017-15873.patch \ 46 file://CVE-2017-15873.patch \
47 file://busybox-CVE-2017-16544.patch \ 47 file://busybox-CVE-2017-16544.patch \
48 file://busybox-fix-lzma-segfaults.patch \ 48 file://busybox-fix-lzma-segfaults.patch \
49 file://umount-ignore-c.patch \
49" 50"
50SRC_URI_append_libc-musl = " file://musl.cfg " 51SRC_URI_append_libc-musl = " file://musl.cfg "
51 52