From 15ae0e7867507f3bde3cd7061fbad933d1fe059c Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 3 Sep 2013 14:29:54 -0700 Subject: recovery: fix use of init reboot method We need to set the system property to "reboot,", not an empty string. Bug: 10605007 Change-Id: I776e0d273764cf254651ab2b25c2743395b990e0 --- recovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recovery.cpp b/recovery.cpp index b78339314..d803cadf1 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"); - property_set(ANDROID_RB_PROPERTY, ""); + property_set(ANDROID_RB_PROPERTY, "reboot,"); return EXIT_SUCCESS; } -- cgit v1.2.3 From d456944f02cf41af63f4a32a974721c8dd6a0f66 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Tue, 10 Sep 2013 15:34:19 -0700 Subject: Don't apply permission changes to symlink. Bug: 10183961 Bug: 10186213 Bug: 8985290 Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e --- updater/install.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/updater/install.c b/updater/install.c index 770dbd09e..0a859452a 100644 --- a/updater/install.c +++ b/updater/install.c @@ -726,6 +726,11 @@ static int ApplyParsedPerms( { int bad = 0; + /* ignore symlinks */ + if (S_ISLNK(statptr->st_mode)) { + return 0; + } + if (parsed.has_uid) { if (chown(filename, parsed.uid, -1) < 0) { printf("ApplyParsedPerms: chown of %s to %d failed: %s\n", -- cgit v1.2.3