summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-12 01:45:04 +0200
committerTao Bao <tbao@google.com>2017-07-23 01:16:21 +0200
commit338be53ed30fc79a34b7e6c80dde7b3cde0d9f84 (patch)
tree553bd11eeebf1cbe4d25f6b541a75bbc6db2bea7
parentMerge "Avoid crashing recovery with unwritable /cache." (diff)
downloadandroid_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.gz
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.bz2
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.lz
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.xz
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.zst
android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.zip
-rw-r--r--roots.cpp4
-rw-r--r--updater/install.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/roots.cpp b/roots.cpp
index e98dfd448..c4afd5de3 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -260,8 +260,6 @@ int format_volume(const char* volume, const char* directory) {
if (result == 0 && directory != nullptr) {
const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static",
"-e",
- "-S",
- "/file_contexts",
"-f",
directory,
"-a",
@@ -270,7 +268,7 @@ int format_volume(const char* volume, const char* directory) {
nullptr };
result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
- }
+ }
} else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
LOG(ERROR) << "format_volume: crypt footer + negative length (" << length
diff --git a/updater/install.cpp b/updater/install.cpp
index c9a3a0799..bfe91e7f9 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -322,8 +322,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
return StringValue(location);
}
- const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-S",
- "/file_contexts", "-a", mount_point.c_str(),
+ const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(),
location.c_str(), nullptr };
status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
if (status != 0) {