From: Dave Reisner <dreisner@archlinux.org>
Date: Wed, 27 Jun 2012 13:47:20 +0000 (-0400)
Subject: findmnt: add FSROOT column
X-Git-Tag: v2.22-rc1~202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b8cd87b2175b0744936a3f48835d0de98844c58;p=thirdparty%2Futil-linux.git

findmnt: add FSROOT column

Provide this separately in an unambiguous format, mainly to avoid the
need for scripts to parse the source of a btrfs subvol or bind mount.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index c4cebf8fa2..d7b252a8b8 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -78,6 +78,7 @@ enum {
 	COL_AVAIL,
 	COL_USED,
 	COL_USEPERC,
+	COL_FSROOT,
 
 	FINDMNT_NCOLUMNS
 };
@@ -118,6 +119,7 @@ static struct colinfo infos[FINDMNT_NCOLUMNS] = {
 	[COL_AVAIL]        = { "AVAIL",           5, TT_FL_RIGHT, N_("filesystem size available") },
 	[COL_USED]         = { "USED",            5, TT_FL_RIGHT, N_("filesystem size used") },
 	[COL_USEPERC]      = { "USE%",            3, TT_FL_RIGHT, N_("filesystem use percentage") },
+	[COL_FSROOT]       = { "FSROOT",       0.25, TT_FL_NOEXTREMES, N_("filesystem root") },
 };
 
 /* global flags */
@@ -470,6 +472,9 @@ static const char *get_data(struct libmnt_fs *fs, int num)
 	case COL_USEPERC:
 		str = get_vfs_attr(fs, col_id);
 		break;
+	case COL_FSROOT:
+		str = mnt_fs_get_root(fs);
+		break;
 	default:
 		break;
 	}