From 7bc6e9ebe4783d5fbae17d7249cb80e997531598 Mon Sep 17 00:00:00 2001 From: Ken Sumrall Date: Thu, 26 May 2011 20:01:39 -0700 Subject: Teach the mount command in init to not consider a wiped partition to be encrypted. Change-Id: I3e989f0b81ec35084baddc04e014406f4d90ce04 --- init/builtins.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'init') diff --git a/init/builtins.c b/init/builtins.c index f2f76b7f..23ef2245 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "init.h" #include "keywords.h" @@ -367,7 +368,9 @@ int do_mount(int nargs, char **args) if (wait) wait_for_file(source, COMMAND_RETRY_TIMEOUT); if (mount(source, target, system, flags, options) < 0) { - /* If this fails, it may be an encrypted filesystem. + /* If this fails, it may be an encrypted filesystem + * or it could just be wiped. If wiped, that will be + * handled later in the boot process. * We only support encrypting /data. Check * if we're trying to mount it, and if so, * assume it's encrypted, mount a tmpfs instead. @@ -375,7 +378,7 @@ int do_mount(int nargs, char **args) * for vold to query when it mounts the real * encrypted /data. */ - if (!strcmp(target, DATA_MNT_POINT)) { + if (!strcmp(target, DATA_MNT_POINT) && !partition_wiped(source)) { const char *tmpfs_options; tmpfs_options = property_get("ro.crypto.tmpfs_options"); -- cgit v1.2.3