Brad Bishop | d5ae7d9 | 2018-06-14 09:52:03 -0700 | [diff] [blame] | 1 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| 2 | Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=426134128112738c97a665170b21153ef0764b7d] |
| 3 | |
| 4 | From 95ea12791c8623bf825bc711ac7790306e7e1adb Mon Sep 17 00:00:00 2001 |
| 5 | From: Shawn Landden <slandden@gmail.com> |
| 6 | Date: Mon, 8 Jan 2018 13:31:58 +0100 |
| 7 | Subject: [PATCH] umount: ignore -c |
| 8 | Organization: O.S. Systems Software LTDA. |
| 9 | |
| 10 | "-c, --no-canonicalize: Do not canonicalize paths." |
| 11 | |
| 12 | As busybox doesn't canonicalize paths in the first place it is safe to ignore |
| 13 | this option. |
| 14 | |
| 15 | See https://github.com/systemd/systemd/issues/7786 |
| 16 | |
| 17 | Signed-off-by: Shawn Landden <slandden@gmail.com> |
| 18 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> |
| 19 | --- |
| 20 | util-linux/umount.c | 4 ++-- |
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 22 | |
| 23 | diff --git a/util-linux/umount.c b/util-linux/umount.c |
| 24 | index 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 | -- |
| 39 | 2.18.0 |
| 40 | |