diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-01-15 10:42:31 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-01-16 10:34:15 +0100 |
| commit | a2eae8f306c002197749dd1ed6e3b3166f97bfeb (patch) | |
| tree | 6b77aaf78ce24374e8f63b07fdd6338ddc91fd47 | |
| parent | 47515f918271e2180294b69b33e42d8aa96f13a4 (diff) | |
| download | ptxdist-a2eae8f306c002197749dd1ed6e3b3166f97bfeb.tar.gz ptxdist-a2eae8f306c002197749dd1ed6e3b3166f97bfeb.tar.xz | |
busybox: add upstream patch to allow using busybox umount with systemd
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/busybox-1.27.2/0100-umount-ignore-c.patch | 32 | ||||
| -rw-r--r-- | patches/busybox-1.27.2/series | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/patches/busybox-1.27.2/0100-umount-ignore-c.patch b/patches/busybox-1.27.2/0100-umount-ignore-c.patch new file mode 100644 index 000000000..4175739db --- /dev/null +++ b/patches/busybox-1.27.2/0100-umount-ignore-c.patch @@ -0,0 +1,32 @@ +From: Shawn Landden <slandden@gmail.com> +Date: Mon, 8 Jan 2018 13:31:58 +0100 +Subject: [PATCH] umount: ignore -c + +"-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 0c50dc9eef44..0425c5b766f2 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) diff --git a/patches/busybox-1.27.2/series b/patches/busybox-1.27.2/series index 84c80aa6e..0a33a9367 100644 --- a/patches/busybox-1.27.2/series +++ b/patches/busybox-1.27.2/series @@ -2,9 +2,10 @@ #tag:base --start-number 1 #tag:upstream-stable --start-number 1 #tag:upstream-master --start-number 100 +0100-umount-ignore-c.patch #tag:ptx --start-number 200 0200-reactivate-check-for-tty.patch 0201-Fix-the-format-warning-when-building-applets-usage_p.patch 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch -# 0036b420b1a49106a872780e90251289 - git-ptx-patches magic +# c4ffec89734e3af634e61b0c146d8c80 - git-ptx-patches magic |