dcavalca / rpms / util-linux

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