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

Fix "No file_contexts" warning

Browse Source 
Fixed by Loading the file_contexts specified in libselinux, whereas
previously recovery loaded /file_contexts which no longer exists.

Bug: 62587423
Test: build and flash recovery on Angler. Warning is gone.
Test: Wipe data and cache.
Test: sideload OTA
Change-Id: I11581c878b860ac5f412e6e8e7acde811f37870f
(cherry picked from commit 2330dd8733)
This commit is contained in:
Jeff Vander Stoep
2017-06-14 15:30:39 -07:00
committed by Jeffrey Vander Stoep
parent 539b08cfcf
commit e35926e1af
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recovery.cpp
+3 -6
View File
@@ -54,6 +54,7 @@
#include <healthd/BatteryMonitor.h> #include <healthd/BatteryMonitor.h>
#include <private/android_logger.h> /* private pmsg functions */ #include <private/android_logger.h> /* private pmsg functions */
#include <private/android_filesystem_config.h> /* for AID_SYSTEM */ #include <private/android_filesystem_config.h> /* for AID_SYSTEM */
#include <selinux/android.h>
#include <selinux/label.h> #include <selinux/label.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
@@ -1481,12 +1482,8 @@ int main(int argc, char **argv) {
ui->SetBackground(RecoveryUI::NONE); ui->SetBackground(RecoveryUI::NONE);
if (show_text) ui->ShowText(true); if (show_text) ui->ShowText(true);
struct selinux_opt seopts[] = { sehandle = selinux_android_file_context_handle();
{ SELABEL_OPT_PATH, "/file_contexts" } selinux_android_set_sehandle(sehandle);
};
sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);
if (!sehandle) { if (!sehandle) {
ui->Print("Warning: No file_contexts\n"); ui->Print("Warning: No file_contexts\n");
} }
updater/updater.cpp
+3 -3
View File
@@ -25,6 +25,7 @@
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <selinux/android.h>
#include <selinux/label.h> #include <selinux/label.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
@@ -139,9 +140,8 @@ int main(int argc, char** argv) {
return 6; return 6;
} }
struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "/file_contexts" } }; sehandle = selinux_android_file_context_handle();
selinux_android_set_sehandle(sehandle);
sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);
if (!sehandle) { if (!sehandle) {
fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n"); fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n");