ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I0ad349f2,I0f528cf1

Browse source 
* changes:
  fs_mgr: allow using legacy A/B suffix
  fs_mgr: adapt to new A/B support
This commit is contained in:
Fernando Lugo 2017-03-23 16:52:50 +00:00 • committed by Gerrit Code Review
commit 27a091d4a1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_slotselect.cpp
View file

@ -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 {