commit b15ebab3ff2c9cc41f16149aa1933b339cb2c9a1
author Fernando Lugo <flugo@google.com> Thu Mar 23 16:52:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 23 16:52:51 2017 +0000
tree 8228747c9bf73c8befd14cdabd5868404d23a17c
parent b0f4b7ca4a813552c86d62e9038a99f4f5b89b32
parent d6e4360b474daa0974ef1b4079e4d34ddc926d0b

Merge changes I0ad349f2,I0f528cf1

* changes:
  fs_mgr: allow using legacy A/B suffix
  fs_mgr: adapt to new A/B support

fs_mgr/fs_mgr_slotselect.cpp

diff --git a/fs_mgr/fs_mgr_slotselect.cpp b/fs_mgr/fs_mgr_slotselect.cpp
index f3bba7b..a536b22 100644
--- a/fs_mgr/fs_mgr_slotselect.cpp
+++ b/fs_mgr/fs_mgr_slotselect.cpp
@@ -35,10 +35,11 @@
                   return -1;
                 }
                 got_suffix = 1;
+                // remove below line when bootloaders fix androidboot.slot_suffix param
+                if (suffix[0] == '_') suffix.erase(suffix.begin());
             }
 
-            if (asprintf(&tmp, "%s%s", fstab->recs[n].blk_device,
-                         suffix.c_str()) > 0) {
+            if (asprintf(&tmp, "%s_%s", fstab->recs[n].blk_device, suffix.c_str()) > 0) {
                 free(fstab->recs[n].blk_device);
                 fstab->recs[n].blk_device = tmp;
             } else {