Commit 4ba6c129 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed PKNAME of lsblk

parent 89370cc7
all:
tar xf util-linux-2.34.tar.xz
patch -Np1 -d util-linux-2.34 < util-linux-2.34-fix_lsblk_pkname.patch
mkdir -pv /var/lib/hwclock
cd util-linux-2.34 && ./configure --build=$(CLFS_TARGET) ADJTIME_PATH=/var/lib/hwclock/adjtime --docdir=/usr/share/doc/util-linux-2.34 --disable-chfn-chsh --disable-login --disable-nologin --disable-su --disable-setpriv --disable-runuser --disable-pylibmount --disable-static
$(MAKE) -C util-linux-2.34
......
diff -uNr util-linux-2.34/misc-utils/lsblk.c util-linux-2.34-fix_lsblk_pkname/misc-utils/lsblk.c
--- util-linux-2.34/misc-utils/lsblk.c 2019-05-23 20:06:32.865212279 +0930
+++ util-linux-2.34-fix_lsblk_pkname/misc-utils/lsblk.c 2019-11-03 01:27:36.940050365 +1030
@@ -1019,6 +1019,9 @@
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;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment