commit a89f873ea2194698938eeb6826cfd32148745968
author Fernando Lugo <flugo@google.com> Wed Mar 22 16:43:51 2017 -0700
committer Fernando Lugo <flugo@google.com> Wed Mar 22 19:21:56 2017 -0700
tree 23a835cbdc81128d88c308aec31bed9d0fc29437
parent 9ba175da697e753212d60dff4d3c9886e218d6c5

fs_mgr: adapt to new A/B support

In the new A/B partition support suffixes don't have "_". So, fix fs_mgr
code that assumes it has "_"

Bug: 36533366
Test: boot
Change-Id: I0f528cf1e8fecacb1b4ae34f6dc42e18ebe777bb
Signed-off-by: Fernando Lugo <flugo@google.com>

fs_mgr/fs_mgr_slotselect.cpp

diff --git a/fs_mgr/fs_mgr_slotselect.cpp b/fs_mgr/fs_mgr_slotselect.cpp
index f3bba7b..f27a79d 100644
--- a/fs_mgr/fs_mgr_slotselect.cpp
+++ b/fs_mgr/fs_mgr_slotselect.cpp
@@ -37,8 +37,7 @@
                 got_suffix = 1;
             }
 
-            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 {