ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lsblk: never fallback to udev/blkid on --sysroot 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-10-29 13:12:18 +01:00
parent 05842a92d8
commit eea06b92dc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc-utils/lsblk-properties.c
View File

@ -55,8 +55,6 @@ static struct lsblk_devprop *get_properties_by_udev(struct lsblk_device *ld)
if (ld->udev_requested)
return ld->properties;
if (lsblk->sysroot)
goto done;
if (!udev)
udev = udev_new(); /* global handler */
if (!udev)
@ -161,12 +159,11 @@ static struct lsblk_devprop *get_properties_by_file(struct lsblk_device *ld)
struct stat sb;
char buf[BUFSIZ];
assert(lsblk->sysroot);
if (ld->file_requested)
return ld->properties;
if (lsblk->sysroot == NULL)
return NULL;
if (ld->properties || ld->filename) {
lsblk_device_free_properties(ld->properties);
ld->properties = NULL;
@ -294,9 +291,9 @@ struct lsblk_devprop *lsblk_device_get_properties(struct lsblk_device *dev)
DBG(DEV, ul_debugobj(dev, "%s: properties requested", dev->filename));
if (lsblk->sysroot)
p = get_properties_by_file(dev);
if (!p)
p = get_properties_by_udev(dev);
return get_properties_by_file(dev);
p = get_properties_by_udev(dev);
if (!p)
p = get_properties_by_blkid(dev);
return p;