umount: add --no-canonicalize

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/mount/umount.8 b/mount/umount.8
index ca67e1d61339d46b3aa3962ffbd0a85a926d5cf5..aa9041128e290142668aa102585993231ae413e8 100644 (file)
--- a/mount/umount.8
+++ b/mount/umount.8
@@ -119,6 +119,10 @@ Lazy unmount. Detach the filesystem from the filesystem hierarchy now,
 and cleanup all references to the filesystem as soon as it is not busy
 anymore.
 (Requires kernel 2.4.11 or later.)
+.IP "\fB\-\-no\-canonicalize\fP"
+Don't canonicalize paths. For more details about this option see the
+.B mount(8)
+man page.
 
 .SH "THE LOOP DEVICE"
 The

diff --git a/mount/umount.c b/mount/umount.c
index a695f0c698da210048f89e0217390d6d0822ddff..7f146558731165663f5f3d533d31146bda69e616 100644 (file)
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -388,6 +388,8 @@ static struct option longopts[] =
   { "version", 0, 0, 'V' },
   { "read-only", 0, 0, 'r' },
   { "types", 1, 0, 't' },
+
+  { "no-canonicalize", 0, 0, 144 },
   { NULL, 0, 0, 0 }
 };
 
@@ -672,7 +674,10 @@ main (int argc, char *argv[]) {
                        types = optarg;
                        break;
                case 'i':
-                       external_allowed = 0;
+                       external_allowed = 0;
+                       break;
+               case 144:
+                       nocanonicalize = 1;
                        break;
                case 0:
                        break;
@@ -691,7 +696,8 @@ main (int argc, char *argv[]) {
                }
        }
 
-       if (restricted && (all || types || nomtab || force || remount)) {
+       if (restricted &&
+           (all || types || nomtab || force || remount || nocanonicalize)) {
                die (2, _("umount: only root can do that"));
        }