rpms/util-linux
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.34-5: #1751290 (lsblk)

Browse Source
This commit is contained in:
Karel Zak 2019-09-12 11:31:43 +02:00
parent 4ac61ab4ac
commit 83243ee93c
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lsblk-force-to-print-PKNAME-for-partition.patch Normal file
View File

@ -0,0 +1,33 @@
From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 27 Jun 2019 09:22:18 +0200
Subject: [PATCH] lsblk: force to print PKNAME for partition
PKNAME (parent kernel device name) is based on printed tree according
to parent -> child relationship. The tree is optional and not printed
if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
versions print the PKNAME also in this case.
Addresses: https://github.com/karelzak/util-linux/issues/813
Signed-off-by: Karel Zak <kzak@redhat.com>
---
misc-utils/lsblk.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index e95af7af0..3ce6da730 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1019,6 +1019,9 @@ static void device_to_scols(
DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name));
+ 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)
return;
--
2.21.0

8
util-linux.spec
View File

@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux
Version: 2.34
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
@ -102,6 +102,9 @@ Requires: libfdisk = %{version}-%{release}
# 151635 - makeing /var/log/lastlog
Patch0: 2.28-login-lastlog-create.patch
# 1751290 - regression: lsblk not showing PKNAME in f31+
Patch1: lsblk-force-to-print-PKNAME-for-partition.patch
%description
The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@ -919,6 +922,9 @@ fi
%{_libdir}/python*/site-packages/libmount/
%changelog
* Thu Sep 12 2019 Karel Zak <kzak@redhat.com> - 2.34-5
- fix #1751290 - regression: lsblk not showing PKNAME in f31+
* Thu Sep 05 2019 Karel Zak <kzak@redhat.com> - 2.34-4
- add BuildRequires: readline for fdisks