diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2016-05-26 02:34:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 02:34:58 +0000 |
| commit | e5bdd2439042f9498a4b61a941c0a6d91da0a379 (patch) | |
| tree | 6f36867fe0204f65c57079c3fafa97a14a91c2f3 | |
| parent | 027dbe1fe7a4f6705689d858ff2efe44c186a1c7 (diff) | |
| parent | fda2038405c0d630cb8136e0755f870febf78066 (diff) | |
| download | squashfs-tools-e5bdd2439042f9498a4b61a941c0a6d91da0a379.tar.gz | |
Don\'t reuse fs_config for root dir, just like make_ext4fs am: 6595c1ff42
am: fda2038405
* commit 'fda2038405c0d630cb8136e0755f870febf78066':
Don't reuse fs_config for root dir, just like make_ext4fs
Change-Id: I71bd51cf6c90951615c00367215164676ec44a12
| -rw-r--r-- | squashfs-tools/mksquashfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ void dir_scan(squashfs_inode *inode, char *pathname, 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); |