From: Karel Zak <kzak@redhat.com>
Date: Tue, 3 Oct 2017 11:01:56 +0000 (+0200)
Subject: rfkill: improve default output
X-Git-Tag: v2.31-rc2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d8e3bcd156976301dbf4da0926e15009f1bdc7b;p=thirdparty%2Futil-linux.git

rfkill: improve default output

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 1379b6b6fd..c84b5850ef 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -99,10 +99,10 @@ struct colinfo {
 /* columns descriptions */
 static const struct colinfo infos[] = {
 	[COL_DEVICE] = {"DEVICE", 0, 0, N_("kernel device name")},
-	[COL_ID]     = {"ID",	  0, 0, N_("device identifier value")},
+	[COL_ID]     = {"ID",	  2, SCOLS_FL_RIGHT, N_("device identifier value")},
 	[COL_TYPE]   = {"TYPE",	  0, 0, N_("device type name that can be used as identifier")},
-	[COL_SOFT]   = {"SOFT",	  0, 0, N_("status of software block")},
-	[COL_HARD]   = {"HARD",	  0, 0, N_("status of hardware block")}
+	[COL_SOFT]   = {"SOFT",	  0, SCOLS_FL_RIGHT, N_("status of software block")},
+	[COL_HARD]   = {"HARD",	  0, SCOLS_FL_RIGHT, N_("status of hardware block")}
 };
 
 static int columns[ARRAY_SIZE(infos) * 2];
@@ -550,9 +550,9 @@ int main(int argc, char **argv)
 	argv += optind;
 
 	if (argc == 0 || strcmp(*argv, "list") == 0) {
-		columns[ncolumns++] = COL_DEVICE;
 		columns[ncolumns++] = COL_ID;
 		columns[ncolumns++] = COL_TYPE;
+		columns[ncolumns++] = COL_DEVICE;
 		columns[ncolumns++] = COL_SOFT;
 		columns[ncolumns++] = COL_HARD;