From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 31 Jul 2014 20:43:29 +0000 (+0200)
Subject: docs: restore the mention of uhelper= and helper= in man page of umount
X-Git-Tag: v2.26-rc1~554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=851c2bd55d9aca823ac14ee875ed76c08031e5f9;p=thirdparty%2Futil-linux.git

docs: restore the mention of uhelper= and helper= in man page of umount

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/sys-utils/umount.8 b/sys-utils/umount.8
index 54fe7ae629..8a640f44d8 100644
--- a/sys-utils/umount.8
+++ b/sys-utils/umount.8
@@ -162,20 +162,30 @@ The syntax of external unmount helpers is:
 .IR type . subtype ]
 .RE
 .PP
-where \fIsuffix\fR is the filesystem type.
+where \fIsuffix\fR is the filesystem type (or the value from a
+\fBuhelper=\fR or \fBhelper=\fR marker in the mtab file).
 The \fB\-t\fR option can be used for filesystems that
 have subtype support.  For example:
 .PP
 .RS
 .B umount.fuse \-t fuse.sshfs
 .RE
+.PP
+A \fBuhelper=\fIsomething\fR marker (unprivileged helper) can appear in
+the \fI/etc/mtab\fR file when ordinary users need to be able to unmount
+a mountpoint that is not defined in \fI/etc/fstab\fR
+(for example for a device that was mounted by \fBudisks\fR(1)).
+.PP
+A \fBhelper=\fItype\fR marker in the mtab file will redirect
+all unmount requests
+to the \fB/sbin/umount.\fItype\fR helper independently of UID.
 .SH FILES
 .TP
 .B /etc/mtab
 table of mounted filesystems
 .TP
 .B /etc/fstab
-checked when option \fB\-O\fR is given
+table of known filesystems
 .SH ENVIRONMENT
 .IP LIBMOUNT_FSTAB=<path>
 overrides the default location of the fstab file