diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-05-14 18:13:00 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-10-18 02:03:27 -0700 |
commit | f6264d40e9a33e2e81efa2660e4ebdd63b2e149f (patch) | |
tree | 4b6c0bce0915c77e8c243d519895bdd90ea1fddc | |
parent | ab313d78b63cfbdc8218ef4c4d64bb1ba021230a (diff) | |
download | system_core-f6264d40e9a33e2e81efa2660e4ebdd63b2e149f.zip system_core-f6264d40e9a33e2e81efa2660e4ebdd63b2e149f.tar.gz system_core-f6264d40e9a33e2e81efa2660e4ebdd63b2e149f.tar.bz2 |
init: update recovery when enabled in settings
Update the recovery image only if the option is enabled
under Developer options
This reverts commit 231e0a9e6a1da6fa4a188840f68af649669e417f.
Change-Id: I928f7ee8bb3eaf5581bb8225661d253ecca0c4ef
Change CM recovery install script filename [2/2]
This is part 2/2 to maintain backwards compatibility with CWM's
verify_root_and_recovery() function. CWM checks if install-recovery.sh
exists and has an executable flag set, then offers to disable the script
for the user. CM now controls this with the persist.sys.recovery_update
property which is configurable via settings, so we don't need to
double-check this.
This changes the name of the recovery install script to
install-cm-recovery.sh.
Change-Id: I275dd358b46c626dfcb8fe02c583a308d5a89c56
init: Move install-recovery.sh back to the standard location
L moved the location of install-recovery.sh from /system/etc/ to
/system/bin. Since CWM recovery isn't looking for this location
anyway, let's return the file to this standard location. This allows
all other code in L to function properly.
Maintain the change to the init to allow flash_recovery to be disabled
in settings.
Change-Id: I8a85db8addeb75a2fd60d809c5ed4edc619ef7ed
-rw-r--r-- | rootdir/init.rc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index d5d12a5..60a7a7b 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -652,6 +652,11 @@ service installd /system/bin/installd service flash_recovery /system/bin/install-recovery.sh class main oneshot + disabled + +# update recovery if enabled +on property:persist.sys.recovery_update=true + start flash_recovery service racoon /system/bin/racoon class main |