summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorKarel Zak2018-10-17 14:13:31 +0200
committerKarel Zak2018-12-07 12:32:58 +0100
commit57a061339b5e522f64aebf5a51abf4f0b2efdb42 (patch)
tree5a653cc3f64ecce23bdf2786457c37ad44065903 /misc-utils
parentlsblk: read queue/discard_granularity only when necessary (diff)
downloadkernel-qcow2-util-linux-57a061339b5e522f64aebf5a51abf4f0b2efdb42.tar.gz
kernel-qcow2-util-linux-57a061339b5e522f64aebf5a51abf4f0b2efdb42.tar.xz
kernel-qcow2-util-linux-57a061339b5e522f64aebf5a51abf4f0b2efdb42.zip
lsblk: apply --nodeps to partitions too
The new implementation differentiates between partitions and another dependences -- this is regression, we need root devices only. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/lsblk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 46f8f3260..d01ff1b35 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1250,13 +1250,13 @@ static int process_dependencies(
assert(dev);
+ if (lsblk->nodeps)
+ return 0;
+
/* read all or specified partition */
if (do_partitions && dev->npartitions)
process_partitions(tr, dev);
- if (lsblk->nodeps)
- return 0;
-
DBG(DEV, ul_debugobj(dev, "%s: reading dependencies", dev->name));
if (!(lsblk->inverse ? dev->nslaves : dev->nholders)) {