From: Karel Zak <kzak@redhat.com>
Date: Thu, 10 Jan 2013 13:58:05 +0000 (+0100)
Subject: findmnt: add OPT-FIELDS column
X-Git-Tag: v2.23-rc1~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=327ea85a73dea98632ebda19b831062463dd544b;p=thirdparty%2Futil-linux.git

findmnt: add OPT-FIELDS column

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

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index adb213c244..96f0177864 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -80,6 +80,7 @@ enum {
 	COL_USEPERC,
 	COL_FSROOT,
 	COL_TID,
+	COL_OPT_FIELDS,
 
 	FINDMNT_NCOLUMNS
 };
@@ -122,6 +123,7 @@ static struct colinfo infos[FINDMNT_NCOLUMNS] = {
 	[COL_USEPERC]      = { "USE%",            3, TT_FL_RIGHT, N_("filesystem use percentage") },
 	[COL_FSROOT]       = { "FSROOT",       0.25, TT_FL_NOEXTREMES, N_("filesystem root") },
 	[COL_TID]          = { "TID",             4, TT_FL_RIGHT, N_("task ID") },
+	[COL_OPT_FIELDS]   = { "OPT-FIELDS",   0.10, TT_FL_TRUNC, N_("optional mount fields") },
 };
 
 /* global flags */
@@ -438,6 +440,9 @@ static const char *get_data(struct libmnt_fs *fs, int num)
 	case COL_FS_OPTIONS:
 		str = mnt_fs_get_fs_options(fs);
 		break;
+	case COL_OPT_FIELDS:
+		str = mnt_fs_get_optional_fields(fs);
+		break;
 	case COL_UUID:
 		str = get_tag(fs, "UUID");
 		break;