From 77ea71d6a85a93c9bf423466e87661b1bf67c512 Mon Sep 17 00:00:00 2001
From: Doug Zongker <dougz@google.com>
Date: Fri, 30 Aug 2013 12:20:16 -0700
Subject: recovery: fix rebooting

Change I84c0513acb549720cb0e8c9fcbda0050f5c396f5 moved reboot
functionality into init but did not update the recovery partition; so
"adb reboot" and /system/bin/reboot in recovery are both broken.

Change-Id: Ie2d14627a686ffb5064256b6c399723636dff116
---
 etc/init.rc  | 3 +++
 recovery.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/init.rc b/etc/init.rc
index b26d2ae73..9d1da1d6a 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 654a66526..b78339314 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;
 }
-- 
cgit v1.2.3