From: Karel Zak <kzak@redhat.com>
Date: Thu, 13 Apr 2017 09:39:22 +0000 (+0200)
Subject: lsblk: fix --inverse --list
X-Git-Tag: v2.30-rc1~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=091683a82f85b4cc81a829b2c1155d4d09cf03cd;p=thirdparty%2Futil-linux.git

lsblk: fix --inverse --list

Let's follow --inverse dependencies although --list output requested.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1441175
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 8eebc8de75..ee1d873d07 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
@@ -114,7 +114,8 @@ Produce output in raw format.  All potentially unsafe characters are hex-escaped
 Output info about SCSI devices only.  All partitions, slaves and holder devices are ignored.
 .TP
 .BR \-s , " \-\-inverse"
-Print dependencies in inverse order.
+Print dependencies in inverse order. If the \fB\-\-list\fR output is requested then
+the lines are still ordered by dependencies.
 .TP
 .BR \-t , " \-\-topology"
 Output info about block-device topology.
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index c30573e8b9..4742a4de10 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -216,6 +216,7 @@ struct lsblk {
 	unsigned int scsi:1;		/* print only device with HCTL (SCSI) */
 	unsigned int paths:1;		/* print devnames with "/dev" prefix */
 	unsigned int sort_hidden:1;	/* sort column not between output columns */
+	unsigned int force_tree_order:1;/* sort lines by parent->tree relation */
 };
 
 static struct lsblk *lsblk;	/* global handler */
@@ -1859,6 +1860,10 @@ int main(int argc, char *argv[])
 		 * /sys is no more sorted */
 		lsblk->sort_id = COL_MAJMIN;
 
+	/* For --inverse --list we still follow parent->child relation */
+	if (lsblk->inverse && !(lsblk->flags & LSBLK_TREE))
+		lsblk->force_tree_order = 1;
+
 	if (lsblk->sort_id >= 0 && column_id_to_number(lsblk->sort_id) < 0) {
 		/* the sort column is not between output columns -- add as hidden */
 		add_column(columns, ncolumns++, lsblk->sort_id);
@@ -1923,6 +1928,8 @@ int main(int argc, char *argv[])
 
 	if (lsblk->sort_col)
 		scols_sort_table(lsblk->table, lsblk->sort_col);
+	if (lsblk->force_tree_order)
+		scols_sort_table_by_tree(lsblk->table);
 
 	scols_print_table(lsblk->table);