Fix error when umounting filesystem on shutdown with a systemd distro. See more datails here: [https://github.com/systemd/systemd/issues/7786]
Signed-off-by: Fabio Berton <[email protected]> --- .../busybox/busybox/umount-ignore-c.patch | 47 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/umount-ignore-c.patch 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..563532bf52 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch @@ -0,0 +1,47 @@ +From d222d23433116088f15b6f9510e42d02744a0de2 Mon Sep 17 00:00:00 2001 +From: Fabio Berton <[email protected]> +Date: Tue, 3 Jul 2018 14:20:52 -0300 +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 <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +Signed-off-by: Fabio Berton <[email protected]> + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=426134128112738c97a665170b21153ef0764b7d] +--- + 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 c6c7441b8..e80266677 100644 +--- a/util-linux/umount.c ++++ b/util-linux/umount.c +@@ -44,7 +44,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result, + } + #endif + +-/* Ignored: -v -t -i ++/* Ignored: -c -v -t -i + * bbox always acts as if -d is present. + * -D can be used to suppress it (bbox extension). + * Rationale: +@@ -52,7 +52,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result, + * thus, on many systems, bare umount _does_ drop loop devices. + * (2) many users request this feature. + */ +-#define OPTION_STRING "fldDnra" "vt:i" ++#define OPTION_STRING "fldDnra" "cvt:i" + #define OPT_FORCE (1 << 0) // Same as MNT_FORCE + #define OPT_LAZY (1 << 1) // Same as MNT_DETACH + //#define OPT_FREE_LOOP (1 << 2) // -d is assumed always present +-- +2.18.0 + diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 1c8580876a..c5540bf4f0 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -61,6 +61,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-tar-add-IF_FEATURE_-checks.patch \ file://0001-iproute-support-scope-.-Closes-8561.patch \ file://0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch \ + file://umount-ignore-c.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
