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

Commit 3a8002f8 authored by Tom Cherry's avatar Tom Cherry
Browse files

update_verifier: correct group in rc file 

update_verifier should be in the cache group, not 'class'.

Also use PLOG instead of LOG if care_map.txt cannot be opened.

Bug: 36818743
Test: boot sailfish
Test: fake OTA on sailfish and verify update_verifier reads care_package
Change-Id: I0ec844cac5ef5c63b18ebee90160854fd84ee829
parent b6609f88

update_verifier/update_verifier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static bool verify_image(const std::string& care_map_name) { 
    // in /data/ota_package. To allow the device to continue booting in this situation,

    // we should print a warning and skip the block verification.

    if (care_map_fd.get() == -1) {

        LOG(WARNING) << "Warning: care map " << care_map_name << " not found.";

        PLOG(WARNING) << "Failed to open " << care_map_name;

        return true;

    }

    // Care map file has four lines (two lines if vendor partition is not present):

update_verifier/update_verifier.rc

+2 −2
Original line number Diff line number Diff line 
service update_verifier_nonencrypted /system/bin/update_verifier nonencrypted

    user root

    class cache

    group cache

    priority -20

    ioprio rt 1



service update_verifier /system/bin/update_verifier ${vold.decrypt}

    user root

    class cache

    group cache

    priority -20

    ioprio rt 1
 
 No newline at end of file