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

Commit 04b10b9a authored by Tao Bao's avatar Tao Bao
Browse files

Change pre-recovery into two services 

/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
(cherry picked from commit e48aed0f)
Change-Id: I9877cd6ac9412ea6a566bb1ec0807940c7a38ce5
parent 6af8e11f

rootdir/init.rc

+9 −4
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ on post-fs 
    # We restorecon /cache in case the cache partition has been reset.

    restorecon_recursive /cache



    # This may have been created by the recovery system with odd permissions

    chown system cache /cache/recovery

    chmod 0770 /cache/recovery

    # Create /cache/recovery in case it's not there. It'll also fix the odd

    # permissions if created by the recovery system.

    mkdir /cache/recovery 0770 system cache



    #change permissions on vmallocinfo so we can grab it from bugreports

    chown root log /proc/vmallocinfo
@@ -640,7 +640,12 @@ service mdnsd /system/bin/mdnsd 
    disabled

    oneshot



service pre-recovery /system/bin/uncrypt

service uncrypt /system/bin/uncrypt

    class main

    disabled

    oneshot



service pre-recovery /system/bin/uncrypt --reboot

    class main

    disabled

    oneshot