From: Karel Zak <kzak@redhat.com>
Date: Wed, 17 Oct 2018 12:13:31 +0000 (+0200)
Subject: lsblk: apply --nodeps to partitions too
X-Git-Tag: v2.34-rc1~211
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a061339b5e522f64aebf5a51abf4f0b2efdb42;p=thirdparty%2Futil-linux.git

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>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 46f8f3260b..d01ff1b355 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)) {