Move recovery\'s convert_fbe folder to /tmp
am: 661f8a69f2
* commit '661f8a69f2b12f3244deed664ab69a9d2efad7fb':
Move recovery's convert_fbe folder to /tmp
diff --git a/recovery.cpp b/recovery.cpp
index 593d094..4ae685f 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -79,8 +79,8 @@
static const char *LOG_FILE = "/cache/recovery/log";
static const char *LAST_INSTALL_FILE = "/cache/recovery/last_install";
static const char *LOCALE_FILE = "/cache/recovery/last_locale";
-static const char *CONVERT_FBE_DIR = "/cache/recovery/convert_fbe";
-static const char *CONVERT_FBE_FILE = "/cache/recovery/convert_fbe/convert_fbe";
+static const char *CONVERT_FBE_DIR = "/tmp/convert_fbe";
+static const char *CONVERT_FBE_FILE = "/tmp/convert_fbe/convert_fbe";
static const char *CACHE_ROOT = "/cache";
static const char *DATA_ROOT = "/data";
static const char *SDCARD_ROOT = "/sdcard";
@@ -576,10 +576,13 @@
if (is_data && reason && strcmp(reason, "convert_fbe") == 0) {
// Create convert_fbe breadcrumb file to signal to init
// to convert to file based encryption, not full disk encryption
- mkdir(CONVERT_FBE_DIR, 0700);
+ if (mkdir(CONVERT_FBE_DIR, 0700) != 0) {
+ ui->Print("Failed to make convert_fbe dir %s\n", strerror(errno));
+ return true;
+ }
FILE* f = fopen(CONVERT_FBE_FILE, "wb");
if (!f) {
- ui->Print("Failed to convert to file encryption\n");
+ ui->Print("Failed to convert to file encryption %s\n", strerror(errno));
return true;
}
fclose(f);