diff options
| author | Alex Deymo <deymo@google.com> | 2016-03-01 18:55:54 -0800 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2016-03-01 18:55:54 -0800 |
| commit | 14dbd333439f34c648b9f783ffa656ef565de0cc (patch) | |
| tree | a55f35b1d7231658201759cc51079e5b3be08acf /common/utils.h | |
| parent | 390efedcb7e17587da765b6d682077cb7fa46ee1 (diff) | |
Mount the new system as 'postinstall_file' in postinstall.
When mounting the new filesystem on /postinstall, we need to override
the file attributes from the new system (unknown to the current selinux
policies) with a consistent label that will be used only in the context
of postinstall. This patch passes an extra option to mount(2) in
Brillo and Android to achieve this.
Bug: 27177071
TEST=Deployed a postinstall script with `ls -laZ`, contents show "postinstall_file".
Change-Id: Ia43b45c92e4c4cd340a884818ac00f24a418f9e7
Diffstat (limited to 'common/utils.h')
| -rw-r--r-- | common/utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/utils.h b/common/utils.h index 8da0726c..df06ef19 100644 --- a/common/utils.h +++ b/common/utils.h @@ -177,7 +177,8 @@ std::string MakePartitionNameForMount(const std::string& part_name); bool MountFilesystem(const std::string& device, const std::string& mountpoint, unsigned long flags, // NOLINT(runtime/int) - const std::string& type); + const std::string& type, + const std::string& fs_mount_options); bool UnmountFilesystem(const std::string& mountpoint); // Returns the block count and the block byte size of the file system on |