commit 4a094fbe87a725df01af9b8fcf03cb1ed626c93d
author Mohamad Ayyash <mkayyash@google.com> Wed May 25 01:34:17 2016 -0700
committer The Android Automerger <android-build@google.com> Wed May 25 18:46:51 2016 -0700
tree 65d3cac82f74b3982e53d89378c7546fc91745e4
parent ec7a8b4ee35b35d2caeebfe03d6a1c9e6f0b2faf

Don't reuse fs_config for root dir, just like make_ext4fs

Change-Id: I1891ae371cea5dc27ce55673f806654a9475c849
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>

squashfs-tools/mksquashfs.c

diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 033bc8e..3501a9f 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -3168,12 +3168,12 @@
 				pathname, strerror(errno));
 /* ANDROID CHANGES START*/
 #ifdef ANDROID
-		if (android_config) {
-			if (mount_point)
-				android_fs_config(fs_config_func, mount_point, &buf, target_out_path, &caps);
-			else
-				android_fs_config(fs_config_func, pathname, &buf, target_out_path, &caps);
-		}
+		buf.st_mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; // root mode
+		buf.st_uid = 0;
+		buf.st_gid = 0;
+		buf.st_mtime = time(NULL);
+		buf.st_dev = 0;
+		buf.st_ino = 0;
 #endif
 /* ANDROID CHANGES END */
 		dir_ent->inode = lookup_inode(&buf);