summaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-07-12 01:45:04 +0200
committerTao Bao <tbao@google.com>2017-07-13 20:52:11 +0200
commit7af933b6a6fd687bd17710ef6fda0ad5483e4d6d (patch)
treeed6b00726231a23f1d3186349feba10a4725b2b2 /roots.cpp
parentMerge "Fix a rare failure for imgdiff when random data equals gzip header" am: b87a166a16 am: 8542502f1f am: 233f4b0b4b (diff)
downloadandroid_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar.gz
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar.bz2
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar.lz
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar.xz
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.tar.zst
android_bootable_recovery-7af933b6a6fd687bd17710ef6fda0ad5483e4d6d.zip
Diffstat (limited to '')
-rw-r--r--roots.cpp4
1 files changed, 1 insertions, 3 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