aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@google.com>2013-08-30 14:10:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-30 14:10:21 -0700
commit79a188cbcfacd898f01d071159b56b87c8612fbf (patch)
tree72ccf7c37e353c979a85b1365e9beb4346e59479
parentf280bb5f763bb91fbaaee1a870de7ba9309472e3 (diff)
parent366f78a9df45d6648746de8454655224b22c31fd (diff)
downloadbootable_recovery-79a188cbcfacd898f01d071159b56b87c8612fbf.zip
bootable_recovery-79a188cbcfacd898f01d071159b56b87c8612fbf.tar.gz
bootable_recovery-79a188cbcfacd898f01d071159b56b87c8612fbf.tar.bz2
am 366f78a9: am 77ea71d6: recovery: fix rebooting
* commit '366f78a9df45d6648746de8454655224b22c31fd': recovery: fix rebooting
-rw-r--r--etc/init.rc3
-rw-r--r--recovery.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/init.rc b/etc/init.rc
index b26d2ae..9d1da1d 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -38,6 +38,9 @@ on boot
class_start default
+on property:sys.powerctl=*
+ powerctl ${sys.powerctl}
+
service ueventd /sbin/ueventd
critical
diff --git a/recovery.cpp b/recovery.cpp
index 654a665..b783393 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1062,6 +1062,6 @@ main(int argc, char **argv) {
// Otherwise, get ready to boot the main system...
finish_recovery(send_intent);
ui->Print("Rebooting...\n");
- android_reboot(ANDROID_RB_RESTART, 0, 0);
+ property_set(ANDROID_RB_PROPERTY, "");
return EXIT_SUCCESS;
}