summaryrefslogtreecommitdiffstats
path: root/sys-utils/umount.8
diff options
context:
space:
mode:
authorBenno Schulenberg2014-07-31 22:43:29 +0200
committerKarel Zak2014-08-05 15:37:36 +0200
commit851c2bd55d9aca823ac14ee875ed76c08031e5f9 (patch)
treeb9363f9ee26b37acaffc98d927c6a5a526c83ef4 /sys-utils/umount.8
parentzrmactl: add new command to control /dev/zramN devices (diff)
downloadkernel-qcow2-util-linux-851c2bd55d9aca823ac14ee875ed76c08031e5f9.tar.gz
kernel-qcow2-util-linux-851c2bd55d9aca823ac14ee875ed76c08031e5f9.tar.xz
kernel-qcow2-util-linux-851c2bd55d9aca823ac14ee875ed76c08031e5f9.zip
docs: restore the mention of uhelper= and helper= in man page of umount
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'sys-utils/umount.8')
-rw-r--r--sys-utils/umount.814
1 files changed, 12 insertions, 2 deletions
diff --git a/sys-utils/umount.8 b/sys-utils/umount.8
index 54fe7ae62..8a640f44d 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