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

Commit 538a822b authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "set-verity-state: Simplify code path around overlayfs_setup()" am:... 

Merge "set-verity-state: Simplify code path around overlayfs_setup()" am: b3e303ca am: 2aa2e7f9 am: 8990b4b2 am: 889c44d4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2173964



Change-Id: I747caf9add3a90c01e9df6266ef8935895446e9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95dc2a56 889c44d4

set-verity-state/set-verity-state.cpp

+3 −7
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static bool set_avb_verity_enabled_state(AvbOps* ops, bool enable_verity) { 
    return false;

  }



  overlayfs_setup(enable_verity);

  printf("Successfully %s verity\n", enable_verity ? "enabled" : "disabled");

  return true;

}
@@ -122,8 +121,6 @@ int main(int argc, char* argv[]) { 


  bool enable = enable_opt.value();



  bool any_changed = false;



  // Figure out if we're using VB1.0 or VB2.0 (aka AVB) - by

  // contract, androidboot.vbmeta.digest is set by the bootloader

  // when using AVB).
@@ -151,6 +148,7 @@ int main(int argc, char* argv[]) { 
    return 0;

  }



  bool any_changed = false;

  if (using_avb) {

    // Yep, the system is using AVB.

    AvbOps* ops = avb_ops_user_new();
@@ -158,12 +156,10 @@ int main(int argc, char* argv[]) { 
      printf("Error getting AVB ops\n");

      return 1;

    }

    if (set_avb_verity_enabled_state(ops, enable)) {

      any_changed = true;

    }

    any_changed |= set_avb_verity_enabled_state(ops, enable);

    avb_ops_user_free(ops);

  }

  if (!any_changed) any_changed = overlayfs_setup(enable);

  any_changed |= overlayfs_setup(enable);



  if (any_changed) {

    printf("Now reboot your device for settings to take effect\n");