Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e35926e1 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by Jeffrey Vander Stoep
Browse files

Fix "No file_contexts" warning 

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 2330dd87)
parent 539b08cf

recovery.cpp

+3 −6
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <healthd/BatteryMonitor.h>

#include <private/android_logger.h> /* private pmsg functions */

#include <private/android_filesystem_config.h>  /* for AID_SYSTEM */

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/selinux.h>

#include <ziparchive/zip_archive.h>
@@ -1481,12 +1482,8 @@ int main(int argc, char **argv) { 
    ui->SetBackground(RecoveryUI::NONE);

    if (show_text) ui->ShowText(true);



    struct selinux_opt seopts[] = {

        { SELABEL_OPT_PATH, "/file_contexts" }

    };



    sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);



    sehandle = selinux_android_file_context_handle();

    selinux_android_set_sehandle(sehandle);

    if (!sehandle) {

        ui->Print("Warning: No file_contexts\n");

    }

updater/updater.cpp

+3 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <android-base/logging.h>

#include <android-base/strings.h>

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/selinux.h>

#include <ziparchive/zip_archive.h>
@@ -139,9 +140,8 @@ int main(int argc, char** argv) { 
    return 6;

  }



  struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "/file_contexts" } };



  sehandle = selabel_open(SELABEL_CTX_FILE, seopts, 1);

  sehandle = selinux_android_file_context_handle();

  selinux_android_set_sehandle(sehandle);



  if (!sehandle) {

    fprintf(cmd_pipe, "ui_print Warning: No file_contexts\n");