2.35.1-5: fix lsblk -P
This commit is contained in:
Karel Zak
parent
20ae04497c
commit
bf2bbaa192
|
|
@ -0,0 +1,80 @@
|
|||
From 91b636b5654576d0b808d0030ca9d773099e1db9 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 25 Feb 2020 15:31:23 +0100
|
||||
Subject: [PATCH] lsblk: fix -P regression from v2.34
|
||||
|
||||
Since v2.34 --list prints devices only once to make the output
|
||||
user-readable. Unfortunately, it's regression for scripts/applications
|
||||
where we need to parse lsblk output. So, let's make --pairs and --raw
|
||||
backwardly compatible with versions before 2.34 and print all hierarchy.
|
||||
|
||||
Addresses: https://github.com/ibm-s390-tools/s390-tools/issues/80
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
misc-utils/lsblk.8 | 10 ++++++----
|
||||
misc-utils/lsblk.c | 9 +++++----
|
||||
2 files changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
|
||||
index 373a80ee2..416b28298 100644
|
||||
--- a/misc-utils/lsblk.8
|
||||
+++ b/misc-utils/lsblk.8
|
||||
@@ -96,7 +96,8 @@ also \fB\-\-tree\fR if necessary.
|
||||
.BR \-l , " \-\-list"
|
||||
Produce output in the form of a list. The output does not provide information
|
||||
about relationships between devices and since version 2.34 every device is
|
||||
-printed only once.
|
||||
+printed only once if \fB\-\-pairs\fR or \fB\-\-raw\fR not specified (the
|
||||
+parsable outputs are maintained in backwardly compatible way).
|
||||
.TP
|
||||
.BR \-M , " \-\-merge"
|
||||
Group parents of sub-trees to provide more readable output for RAIDs and
|
||||
@@ -122,14 +123,15 @@ specified in the format \fI+list\fP (e.g., \fBlsblk \-o +UUID\fP).
|
||||
Output all available columns.
|
||||
.TP
|
||||
.BR \-P , " \-\-pairs"
|
||||
-Produce output in the form of key="value" pairs.
|
||||
-All potentially unsafe characters are hex-escaped (\\x<code>).
|
||||
+Produce output in the form of key="value" pairs. The output lines are still ordered by
|
||||
+dependencies. All potentially unsafe characters are hex-escaped (\\x<code>).
|
||||
.TP
|
||||
.BR \-p , " \-\-paths"
|
||||
Print full device paths.
|
||||
.TP
|
||||
.BR \-r , " \-\-raw"
|
||||
-Produce output in raw format. All potentially unsafe characters are hex-escaped
|
||||
+Produce output in raw format. The output lines are still ordered by
|
||||
+dependencies. All potentially unsafe characters are hex-escaped
|
||||
(\\x<code>) in the NAME, KNAME, LABEL, PARTLABEL and MOUNTPOINT columns.
|
||||
.TP
|
||||
.BR \-S , " \-\-scsi"
|
||||
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
|
||||
index 441655e24..72ac7b483 100644
|
||||
--- a/misc-utils/lsblk.c
|
||||
+++ b/misc-utils/lsblk.c
|
||||
@@ -1058,8 +1058,8 @@ static void device_to_scols(
|
||||
if (!parent && dev->wholedisk)
|
||||
parent = dev->wholedisk;
|
||||
|
||||
- /* Do not print device more than one in --list mode */
|
||||
- if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
|
||||
+ /* Do not print device more than once on --list if tree order is not requested */
|
||||
+ if (!(lsblk->flags & LSBLK_TREE) && !lsblk->force_tree_order && dev->is_printed)
|
||||
return;
|
||||
|
||||
if (lsblk->merge && list_count_entries(&dev->parents) > 1) {
|
||||
@@ -2044,8 +2044,9 @@ int main(int argc, char *argv[])
|
||||
* /sys is no more sorted */
|
||||
lsblk->sort_id = COL_MAJMIN;
|
||||
|
||||
- /* For --inverse --list we still follow parent->child relation */
|
||||
- if (lsblk->inverse && !(lsblk->flags & LSBLK_TREE))
|
||||
+ /* For --{inverse,raw,pairs} --list we still follow parent->child relation */
|
||||
+ if (!(lsblk->flags & LSBLK_TREE)
|
||||
+ && (lsblk->inverse || lsblk->flags & LSBLK_EXPORT || lsblk->flags & LSBLK_RAW))
|
||||
lsblk->force_tree_order = 1;
|
||||
|
||||
if (lsblk->sort_id >= 0 && column_id_to_number(lsblk->sort_id) < 0) {
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: A collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.35.1
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||
|
||||
|
|
@ -111,6 +111,8 @@ Patch0: 2.28-login-lastlog-create.patch
|
|||
Patch1: 0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch
|
||||
# https://github.com/karelzak/util-linux/issues/948
|
||||
Patch2: 0002-fstrim-do-not-use-Protect-setting-in-systemd-service.patch
|
||||
# https://github.com/ibm-s390-tools/s390-tools/issues/80
|
||||
Patch3: 0003-lsblk-fix-P-regression-from-v2.34.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
|
|
@ -934,6 +936,9 @@ fi
|
|||
%{_libdir}/python*/site-packages/libmount/
|
||||
|
||||
%changelog
|
||||
* Tue Feb 25 2020 Karel Zak <kzak@redhat.com> - 2.35.1-5
|
||||
- fix lsblk -P output for RAIDs, etc.
|
||||
|
||||
* Thu Feb 06 2020 Karel Zak <kzak@redhat.com> - 2.35.1-4
|
||||
- add triggerpostun for fstrim.timer (#1785041, FESCo #2309)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue