| From 24cd2c1c2893cf456bd93ed3091fca878bfc014f Mon Sep 17 00:00:00 2001 |
| From: Eddie James <eajames@us.ibm.com> |
| Date: Thu, 5 Jul 2018 08:46:18 -0500 |
| Subject: [PATCH] umount: ignore -c |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| systemd uses -c. |
| -c, --no-canonicalize |
| Do not canonicalize paths. The paths canonicalization is based |
| on stat(2) and readlink(2) system calls. These system calls may |
| hang in some cases (for example on NFS if server is not avail‐ |
| able). The option has to be used with canonical path to the |
| mount point. |
| |
| For more details about this option see the mount(8) man page. |
| Note that umount does not pass this option to the |
| /sbin/umount.type helpers. |
| |
| 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 at gmail.com> |
| Signed-off-by: Eddie James <eajames@us.ibm.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 0c50dc9..0425c5b 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) |
| -- |
| 1.8.3.1 |
| |