commit 1f3ad4e0fd1a9aab89de0c3531d6ad7a7a14445c
author Tom Cherry <tomcherry@google.com> Thu Aug 29 20:24:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 29 20:24:52 2019 +0000
tree 7d0db0cc8975c9bf9c9fcb5da20838c981ef2076
parent abc6b4733cebaec35f16ae0bb055b2e297c81df7
parent 287164c3b04554dac262d6e61a70927c7cb99b1f

Merge "fastboot: preserve partition_type if wants_wipe=true"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 5bd37e1..4737ae4 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -2058,10 +2058,10 @@
             if (partition == "userdata" && set_fbe_marker) {
                 fprintf(stderr, "setting FBE marker on initial userdata...\n");
                 std::string initial_userdata_dir = create_fbemarker_tmpdir();
-                fb_perform_format(partition, 1, "", "", initial_userdata_dir);
+                fb_perform_format(partition, 1, partition_type, "", initial_userdata_dir);
                 delete_fbemarker_tmpdir(initial_userdata_dir);
             } else {
-                fb_perform_format(partition, 1, "", "", "");
+                fb_perform_format(partition, 1, partition_type, "", "");
             }
         }
     }