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

Commit b8cadd77 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "init.rc: fix (re)starting apexd on FDE devices" am: 4bb41c0e 

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

Change-Id: I71ae39d715aa2b56dd77b03ea19c3aa9584dfdfa
parents 16d0600e 4bb41c0e

rootdir/init.rc

+6 −2
Original line number Diff line number Diff line
@@ -685,6 +685,10 @@ on post-fs-data 
    exec - system system -- /system/bin/vdc keymaster earlyBootEnded



    # /data/apex is now available. Start apexd to scan and activate APEXes.

    #

    # To handle userspace reboots as well as devices that use FDE, make sure

    # that apexd is started cleanly here (set apexd.status="") and that it is

    # restarted if it's already running.

    mkdir /data/apex 0755 root system encryption=None

    mkdir /data/apex/active 0755 root system

    mkdir /data/apex/backup 0700 root system
@@ -693,7 +697,8 @@ on post-fs-data 
    mkdir /data/apex/sessions 0700 root system

    mkdir /data/app-staging 0751 system system encryption=DeleteIfNecessary

    mkdir /data/apex/ota_reserved 0700 root system encryption=Require

    start apexd

    setprop apexd.status ""

    restart apexd



    # create rest of basic filesystem structure

    mkdir /data/misc/recovery 0770 system log
@@ -1240,7 +1245,6 @@ on userspace-reboot-requested 
  setprop dev.bootcomplete ""

  setprop sys.init.updatable_crashing ""

  setprop sys.init.updatable_crashing_process_name ""

  setprop apexd.status ""

  setprop sys.user.0.ce_available ""

  setprop sys.shutdown.requested ""

  setprop service.bootanim.exit ""