Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89573b39 authored by Fernando Lugo's avatar Fernando Lugo Committed by android-build-merger
Browse files

Merge changes I0ad349f2,I0f528cf1 am: 27a091d4 

am: 69482cc1

Change-Id: I4871700c01aa89068992ccb04dd6cdfc152434ee
parents 393fcff0 69482cc1

fs_mgr/fs_mgr_slotselect.cpp

+3 −2
Original line number Diff line number Diff line
@@ -35,10 +35,11 @@ int fs_mgr_update_for_slotselect(struct fstab *fstab) 
                  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 {