aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2018-02-05 11:19:43 -0800
committerLuis Hector Chavez <lhchavez@google.com>2018-02-05 11:23:30 -0800
commit85a6bc1e52bb911f195c5dc0890717913938c2d1 (patch)
treef0b5b42577fa9db5db4a5311c286edf75d2853dd
parentbe7549061d134b92ce90909c8168e4c076a0040b (diff)
downloadsquashfs-tools-85a6bc1e52bb911f195c5dc0890717913938c2d1.tar.gz
mksquashfs: Run android_fs_config() on the root inode
This change runs android_fs_config() on the root inode. This is needed in the case where the root of the filesystem is present in the android_fs_config file. Bug: 72745016 Test: mksquashfs path system.raw.img -fs-config-file fs_config -android-fs-config Change-Id: I5954cd5e7a597dbc956fa150c8ff6835d51ee294
-rw-r--r--squashfs-tools/mksquashfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 60be156..5df1f94 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -3296,6 +3296,9 @@ void dir_scan(squashfs_inode *inode, char *pathname,
/* ANDROID CHANGES START*/
#ifdef ANDROID
dir_ent->capabilities = caps;
+ if (android_config) {
+ android_fs_config(fs_config_func, "", &dir_ent->inode->buf, target_out_path, &dir_ent->capabilities);
+ }
#endif
/* ANDROID CHANGES END */