diff options
| author | Tao Bao <tbao@google.com> | 2017-07-23 06:07:34 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-23 06:07:34 +0200 |
| commit | fd632396213f2c413ac2bbad982f7e1e904dc02e (patch) | |
| tree | b9907f0ee5b70b2c614a508b3c16297084b71d54 | |
| parent | Merge "Avoid crashing recovery with unwritable /cache." am: 9187f1cc51 (diff) | |
| parent | Merge "Remove the obsolete reference to /file_contexts." (diff) | |
| download | android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar.gz android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar.bz2 android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar.lz android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar.xz android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.tar.zst android_bootable_recovery-fd632396213f2c413ac2bbad982f7e1e904dc02e.zip | |
| -rw-r--r-- | roots.cpp | 4 | ||||
| -rw-r--r-- | updater/install.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
@@ -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) { |