PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the obsolete reference to /file_contexts."

Browse Source 
am: 6b09b895be

Change-Id: I2b26ced9ffeb278ce01ff2ca7be4057b0ab6c61c
This commit is contained in:
Tao Bao
2017-07-23 04:03:34 +00:00
committed by android-build-merger
parent 4fb2825dc2 6b09b895be
commit 248b4f9dca
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+1 -3
View File
@@ -260,8 +260,6 @@ int format_volume(const char* volume, const char* directory) {
if (result == 0 && directory != nullptr) { if (result == 0 && directory != nullptr) {
const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static",
"-e", "-e",
"-S",
"/file_contexts",
"-f", "-f",
directory, directory,
"-a", "-a",
@@ -270,7 +268,7 @@ int format_volume(const char* volume, const char* directory) {
nullptr }; nullptr };
result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
} }
} else { /* Has to be f2fs because we checked earlier. */ } else { /* Has to be f2fs because we checked earlier. */
if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) { if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
LOG(ERROR) << "format_volume: crypt footer + negative length (" << length LOG(ERROR) << "format_volume: crypt footer + negative length (" << length
updater/install.cpp
+1 -2
View File
@@ -322,8 +322,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
return StringValue(location); return StringValue(location);
} }
const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-S", const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e", "-a", mount_point.c_str(),
"/file_contexts", "-a", mount_point.c_str(),
location.c_str(), nullptr }; location.c_str(), nullptr };
status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv)); status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
if (status != 0) { if (status != 0) {