From 631280e05be9372de17ec5aa27b54ed1706d0b53 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 16 Apr 2010 14:41:21 +0200 Subject: [PATCH] findmnt: add {fs,vfs}-options columns Signed-off-by: Karel Zak --- misc-utils/findmnt.8 | 2 ++ misc-utils/findmnt.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 index 81a6072e..17654728 100644 --- 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 6ce1ec8a..297b886c 100644 --- 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; -- 2.39.5