This commit is contained in:
Koushik Dutta 2010-06-11 00:49:49 -07:00
parent cdb63355c1
commit 1741dcdb26
3 changed files with 9 additions and 2 deletions

View File

@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.7
RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.8
LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)

View File

@ -1,4 +1,8 @@
#!/sbin/sh
mkdir -p /sd-ext
rm /cache/recovery/command
rm /cache/update.zip
touch /tmp/.ignorebootmessage
kill $(ps | grep /sbin/adbd)
kill $(ps | grep /sbin/recovery)
exit 1

View File

@ -27,6 +27,7 @@
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#include <sys/stat.h>
#include "bootloader.h"
#include "common.h"
@ -166,8 +167,10 @@ get_args(int *argc, char ***argv) {
LOGI("Boot status: %.*s\n", sizeof(boot.status), boot.status);
}
struct stat file_info;
// --- if arguments weren't supplied, look in the bootloader control block
if (*argc <= 1) {
if (*argc <= 1 && 0 != stat("/tmp/.ignorebootmessage", &file_info)) {
boot.recovery[sizeof(boot.recovery) - 1] = '\0'; // Ensure termination
const char *arg = strtok(boot.recovery, "\n");
if (arg != NULL && !strcmp(arg, "recovery")) {