304038
From d7725fb45fe8d4fcb67cb9fbc117bc1cf66fcd56 Mon Sep 17 00:00:00 2001
304038
From: Karel Zak <kzak@redhat.com>
304038
Date: Tue, 17 Oct 2017 10:44:01 +0200
304038
Subject: [PATCH 136/141] blkid: update man page about lsblk and ambivalent
304038
 probing
304038
304038
Upstream: http://github.com/karelzak/util-linux/commit/12786a901520d7b30ff75ee8727221bf8a3089cb
304038
Upstream: http://github.com/karelzak/util-linux/commit/27fbfef33c1f23b5448b6cee856bcb3500b33c42
304038
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1501953
304038
Signed-off-by: Karel Zak <kzak@redhat.com>
304038
---
304038
 misc-utils/blkid.8 | 39 +++++++++++++++++++++++++++------------
304038
 1 file changed, 27 insertions(+), 12 deletions(-)
304038
304038
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
304038
index a974b8e99..1f12d202a 100644
304038
--- a/misc-utils/blkid.8
304038
+++ b/misc-utils/blkid.8
304038
@@ -61,6 +61,23 @@ library.  It can determine the type of content (e.g. filesystem or swap)
304038
 that a block device holds, and also the attributes (tokens, NAME=value pairs)
304038
 from the content metadata (e.g. LABEL or UUID fields).
304038
 .PP
304038
+.B It is recommended to use
304038
+.BR lsblk (8)
304038
+.B command to get information about block devices, or lsblk --fs to get an overview of filesystems, or
304038
+.BR findmnt (8)
304038
+.B to search in already mounted filesystems.
304038
+.PP
304038
+.RS
304038
+.BR lsblk (8)
304038
+provides more information, better control on output formatting, easy to use in
304038
+scripts and it does not require root permissions to get actual information.
304038
+.B blkid
304038
+reads information directly from devices and for non-root users
304038
+it returns cached unverified information.
304038
+.B blkid
304038
+is mostly designed for system services and to test libblkid functionality.
304038
+.RE
304038
+.PP
304038
 When
304038
 .I device
304038
 is specified, tokens from only this device are displayed.
304038
@@ -71,21 +88,19 @@ If none is given, all devices which appear in
304038
 .I /proc/partitions
304038
 are shown, if they are recognized.
304038
 .PP
304038
-Note that
304038
-.B blkid
304038
-reads information directly from devices and for non-root users
304038
-it returns cached unverified information.  It is better to use
304038
-.B lsblk --fs
304038
-to get a user-friendly overview of filesystems and devices.
304038
-.BR lsblk (8)
304038
-is also easy to use in scripts.
304038
-.B blkid
304038
-is mostly designed for system services and to test libblkid functionality.
304038
-.PP
304038
 .B blkid
304038
 has two main forms of operation: either searching for a device with a
304038
 specific NAME=value pair, or displaying NAME=value pairs for one or
304038
 more specified devices.
304038
+.PP
304038
+For security reasons
304038
+.B blkid
304038
+silently ignores all devices where the probing result is ambivalent (multiple
304038
+colliding filesystems are detected).  The low-level probing mode (\fB-p\fR)
304038
+provides more information and extra return code in this case.
304038
+It's recommended to use
304038
+.BR wipefs (8)
304038
+to get a detailed overview and to erase obsolete stuff (magic strings) from the device.
304038
 .SH OPTIONS
304038
 The \fIsize\fR and \fIoffset\fR arguments may be followed by the multiplicative
304038
 suffixes like KiB (=1024), MiB (=1024*1024), and so on for GiB, TiB, PiB, EiB, ZiB and YiB
304038
@@ -264,7 +279,7 @@ identified, an exit code of 2 is returned.
304038
 
304038
 For usage or other errors, an exit code of 4 is returned.
304038
 
304038
-If an ambivalent low-level probing result was detected, an exit code of 8 is
304038
+If an ambivalent probing result was detected by low-level probing mode (\fB\-p\fR), an exit code of 8 is
304038
 returned.
304038
 .SH CONFIGURATION FILE
304038
 The standard location of the
304038
-- 
304038
2.13.6
304038