Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
util-linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
util-linux
Commits
4ba6c129
Commit
4ba6c129
authored
Nov 03, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed PKNAME of lsblk
parent
89370cc7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
Makefile
Makefile
+1
-0
util-linux-2.34-fix_lsblk_pkname.patch
util-linux-2.34-fix_lsblk_pkname.patch
+13
-0
No files found.
Makefile
View file @
4ba6c129
all
:
all
:
tar
xf util-linux-2.34.tar.xz
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
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
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
$(MAKE)
-C
util-linux-2.34
...
...
util-linux-2.34-fix_lsblk_pkname.patch
0 → 100644
View file @
4ba6c129
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;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment