findmnt: add {fs,vfs}-options columns

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

diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 81a6072ecb2d9555dc9ceeb69043a777f17eed5b..17654728c11e6dbee56fcda057ccd5565733237a 100644 (file)
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -91,6 +91,8 @@ Define output columns. Currently are supported
 .BR TARGET ,
 .BR FSTYPE ,
 .BR OPTIONS ,
+.BR VFS-OPTIONS ,
+.BR FS-OPTIONS ,
 .BR LABEL
 and
 .BR UUID .

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 6ce1ec8ad1e4f141102e4fc0a70587b0ebe5fa52..297b886c7906c33f5e322ee985e3cd696d487da6 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -56,6 +56,8 @@ enum {
        COL_TARGET,
        COL_FSTYPE,
        COL_OPTIONS,
+       COL_VFS_OPTIONS,
+       COL_FS_OPTIONS,
        COL_LABEL,
        COL_UUID,
 
@@ -76,6 +78,8 @@ struct colinfo infos[__NCOLUMNS] = {
        [COL_TARGET]  = { "TARGET",     0.30, FALSE },
        [COL_FSTYPE]  = { "FSTYPE",     0.10, TRUE },
        [COL_OPTIONS] = { "OPTIONS",    0.10, TRUE },
+       [COL_VFS_OPTIONS] = { "VFS-OPTIONS", 0.20, TRUE },
+       [COL_FS_OPTIONS] = { "FS-OPTIONS", 0.10, TRUE },
        [COL_LABEL]   = { "LABEL",      0.10, FALSE },
        [COL_UUID]    = { "UUID",         36, FALSE },
 };
@@ -274,6 +278,12 @@ static const char *get_data(mnt_fs *fs, int num)
        case COL_OPTIONS:
                str = mnt_fs_get_optstr(fs);
                break;
+       case COL_VFS_OPTIONS:
+               str = mnt_fs_get_vfs_optstr(fs);
+               break;
+       case COL_FS_OPTIONS:
+               str = mnt_fs_get_fs_optstr(fs);
+               break;
        case COL_UUID:
                str = get_tag(fs, "UUID");
                break;