1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00

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>
This commit is contained in:
Fabio Berton
2018-07-03 16:26:00 -03:00
committed by Richard Purdie
parent 66f380e4b0
commit 5a1a699415
2 changed files with 41 additions and 0 deletions
@@ -0,0 +1,40 @@
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=426134128112738c97a665170b21153ef0764b7d]
From 95ea12791c8623bf825bc711ac7790306e7e1adb Mon Sep 17 00:00:00 2001
From: Shawn Landden <slandden@gmail.com>
Date: Mon, 8 Jan 2018 13:31:58 +0100
Subject: [PATCH] umount: ignore -c
Organization: O.S. Systems Software LTDA.
"-c, --no-canonicalize: Do not canonicalize paths."
As busybox doesn't canonicalize paths in the first place it is safe to ignore
this option.
See https://github.com/systemd/systemd/issues/7786
Signed-off-by: Shawn Landden <slandden@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
util-linux/umount.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 0c50dc9ee..0425c5b76 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -68,8 +68,8 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
}
#endif
-/* ignored: -v -t -i */
-#define OPTION_STRING "fldnra" "vt:i"
+/* ignored: -c -v -t -i */
+#define OPTION_STRING "fldnra" "cvt:i"
#define OPT_FORCE (1 << 0) // Same as MNT_FORCE
#define OPT_LAZY (1 << 1) // Same as MNT_DETACH
#define OPT_FREELOOP (1 << 2)
--
2.18.0
@@ -46,6 +46,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://CVE-2017-15873.patch \
file://busybox-CVE-2017-16544.patch \
file://busybox-fix-lzma-segfaults.patch \
file://umount-ignore-c.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "