diff options
| author |   Fabio Berton <fabio.berton@ossystems.com.br> | 2018-07-03 16:26:00 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 00:22:08 +0100 |
| commit | 32320709311af076bb58399d9bb9299446d65f04 (patch) | |
| tree | a477b1fdceaf9d019a3362d7ab3838d0a3dc8cea /meta/recipes-core/busybox | |
| parent | a77a6dad43388007db78623d0e4c38aedc64c63b (diff) | |
| download | openembedded-core-contrib-32320709311af076bb58399d9bb9299446d65f04.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)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/umount-ignore-c.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.27.2.bb | 1 |
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 @@ +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 + 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 \ 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 " |