From d4329a1ebefda63bcf23539e22f1e21478fc1f7b Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 2 May 2013 02:09:39 -0700
Subject: [PATCH] add reboot binary

Change-Id: Ie059daae4cc0525ab67c9c774a1a106a8e50a0b3
---
 Superuser/assets/reboot                                  | Bin 0 -> 5500 bytes
 Superuser/jni/su/su.h                                    |   2 ++
 .../src/com/koushikdutta/superuser/MainActivity.java     |  13 +++++++++++++
 3 files changed, 15 insertions(+)
 create mode 100755 Superuser/assets/reboot

diff --git a/Superuser/assets/reboot b/Superuser/assets/reboot
new file mode 100755
index 0000000000000000000000000000000000000000..3f5485708dd4a3b8b8dbe4953b150e841e43634c
GIT binary patch
literal 5500
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
B&Gi5P

literal 0
HcmV?d00001

diff --git a/Superuser/jni/su/su.h b/Superuser/jni/su/su.h
index 3c635e6..a905bbf 100644
--- a/Superuser/jni/su/su.h
+++ b/Superuser/jni/su/su.h
@@ -80,7 +80,9 @@
 #define xstr(a) str(a)
 #define str(a) #a
 
+#ifndef VERSION_CODE
 #define VERSION_CODE 9
+#endif
 #define VERSION xstr(VERSION_CODE) " " REQUESTOR
 
 #define PROTO_VERSION 1
diff --git a/Superuser/src/com/koushikdutta/superuser/MainActivity.java b/Superuser/src/com/koushikdutta/superuser/MainActivity.java
index 4b485df..418ab2a 100644
--- a/Superuser/src/com/koushikdutta/superuser/MainActivity.java
+++ b/Superuser/src/com/koushikdutta/superuser/MainActivity.java
@@ -107,6 +107,14 @@ public class MainActivity extends BetterListActivity {
                     doEntry(zout, "assets/update-binary", "META-INF/com/google/android/update-binary");
                     zout.close();
 
+                    ZipFile zf = new ZipFile(getPackageCodePath());
+                    ZipEntry ze = zf.getEntry("assets/reboot");
+                    InputStream in;
+                    FileOutputStream reboot;
+                    StreamUtility.copyStream(in = zf.getInputStream(ze), reboot = openFileOutput("reboot", MODE_PRIVATE));
+                    reboot.close();
+                    in.close();
+
                     final File su = extractSu();
 
                     String command =
@@ -118,10 +126,15 @@ public class MainActivity extends BetterListActivity {
                             "chmod 644 /cache/superuser.zip\n" +
                             "chmod 644 /cache/recovery/command\n" +
                             "sync\n" +
+                            String.format("chmod 755 %s\n", getFileStreamPath("reboot").getAbsolutePath()) +
                             "reboot recovery\n";
                     Process p = Runtime.getRuntime().exec("su");
                     p.getOutputStream().write(command.getBytes());
                     p.getOutputStream().close();
+                    File rebootScript = getFileStreamPath("reboot.sh");
+                    StreamUtility.writeFile(rebootScript, "reboot recovery ; " + getFileStreamPath("reboot").getAbsolutePath() + " recovery ;");
+                    p.waitFor();
+                    Runtime.getRuntime().exec(new String[] { "su", "-c", ". " + rebootScript.getAbsolutePath() });
                     if (p.waitFor() != 0)
                         throw new Exception("non zero result");
                 }
-- 
2.11.0