diff options
author | Tao Bao <tbao@google.com> | 2017-07-11 16:45:04 -0700 |
---|---|---|
committer | Tao Bao <tbao@google.com> | 2017-07-22 16:16:21 -0700 |
commit | 338be53ed30fc79a34b7e6c80dde7b3cde0d9f84 (patch) | |
tree | 553bd11eeebf1cbe4d25f6b541a75bbc6db2bea7 /roots.cpp | |
parent | 9187f1cc51cc04155754d0ed34a5fc875acb9af4 (diff) | |
download | android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.gz android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.tar.bz2 android_bootable_recovery-338be53ed30fc79a34b7e6c80dde7b3cde0d9f84.zip |
Remove the obsolete reference to /file_contexts.
This file no longer exists:
- /file_contexts has been split into plat_file_contexts and
nonplat_file_contexts since commit
b236eb6ca204cefcb926e19bd5682f9dcad4021d (system/sepolicy).
- It was named /file_contexts.bin prior to the split.
'-S file_contexts' is also no longer required by e2fsdroid, since commit
2fff6fb036cbbb6dedd7da3d208b312a9038a5ce (external/e2fsprogs). It will
load the file contexts via libselinux.
Test: Trigger the path by performing a data wipe for converting to FBE.
Change-Id: I179939da409e5c0415ae0ea0bf5ddb23f9e6331e
(cherry picked from commit 7af933b6a6fd687bd17710ef6fda0ad5483e4d6d)
Diffstat (limited to 'roots.cpp')
-rw-r--r-- | roots.cpp | 4 |
1 files changed, 1 insertions, 3 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 |