From: Romain Izard <romain.izard.pro@gmail.com>
Date: Tue, 3 Oct 2017 08:50:28 +0000 (+0200)
Subject: mkfs.ubifs: Apply squash-uids to the root node
X-Git-Tag: v2.0.2~29
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=afba4fc3b7e989d8b23176ffbf6e84164920a079;p=mtd-utils.git

mkfs.ubifs: Apply squash-uids to the root node

The root node of the file system needs to be handled as a special case
when removing the owner information from the input.

Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index 9e69a4f..d432dfe 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -1831,6 +1831,8 @@ static int write_data(void)
 		if (err)
 			return sys_err_msg("bad root file-system directory '%s'",
 					   root);
+		if (squash_owner)
+			root_st.st_uid = root_st.st_gid = 0;
 	} else {
 		root_st.st_mtime = time(NULL);
 		root_st.st_atime = root_st.st_ctime = root_st.st_mtime;