commit df1e97b7068c33dd1a2ff15cb3c0f34445055227
author Tao Bao <tbao@google.com> Wed Dec 14 21:29:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 14 21:29:17 2016 +0000
tree a189a02123345a7bcfa94eac3aa66797fd318365
parent 0fc1c7a2ea45c58eaade7ab97b8d422973751ddc
parent f65e00a0044227763693f2de372f8c4eac19891f

Merge "init: Specify the data wipe reason." am: d9b9ebb887
am: 431b41b320

Change-Id: Idaa2d5ff62b4fc7e98e3d6d8ebadb5e393516198

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 42dd0c6..cf8b274 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -559,7 +559,7 @@
     } else if (code == FS_MGR_MNTALL_DEV_NEEDS_RECOVERY) {
         /* Setup a wipe via recovery, and reboot into recovery */
         PLOG(ERROR) << "fs_mgr_mount_all suggested recovery, so wiping data via recovery.";
-        ret = wipe_data_via_recovery("wipe_data_via_recovery");
+        ret = wipe_data_via_recovery("fs_mgr_mount_all");
         /* If reboot worked, there is no return. */
     } else if (code == FS_MGR_MNTALL_DEV_FILE_ENCRYPTED) {
         if (e4crypt_install_keyring()) {