summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2015-04-07 08:45:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-07 08:45:24 +0000
commit284c5cb2a16d21e5d5123ae6a0d731dcc6beadca (patch)
tree83e432d5869f178344cbb7a378f19eef77f48baf /init
parent33c2ad37cac1d85272bd0f8f869710cac73d3bb7 (diff)
parent454742392f72079dbdb0d23ea24e01b5703c1aa5 (diff)
downloadsystem_core-284c5cb2a16d21e5d5123ae6a0d731dcc6beadca.zip
system_core-284c5cb2a16d21e5d5123ae6a0d731dcc6beadca.tar.gz
system_core-284c5cb2a16d21e5d5123ae6a0d731dcc6beadca.tar.bz2
Merge "Set verity mode as the verified property value"
Diffstat (limited to 'init')
-rw-r--r--init/builtins.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index ff6c937..3bbaf83 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -661,8 +661,9 @@ int do_verity_load_state(int nargs, char **args) {
return rc;
}
-static void verity_update_property(fstab_rec *fstab, const char *mount_point, int status) {
- property_set(android::base::StringPrintf("partition.%s.verified", mount_point).c_str(), "1");
+static void verity_update_property(fstab_rec *fstab, const char *mount_point, int mode, int status) {
+ property_set(android::base::StringPrintf("partition.%s.verified", mount_point).c_str(),
+ android::base::StringPrintf("%d", mode).c_str());
}
int do_verity_update_state(int nargs, char** args) {