fs_mgr: Add support for A/B partitions
am: fd2f0b4dc4
* commit 'fd2f0b4dc496319f94d024b0c841b639245df0a4':
fs_mgr: Add support for A/B partitions
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
index cf35b3f..125ee0b 100644
--- a/fs_mgr/fs_mgr_fstab.c
+++ b/fs_mgr/fs_mgr_fstab.c
@@ -22,6 +22,8 @@
#include <sys/mount.h>
#include <unistd.h>
+#include <cutils/properties.h>
+
#include "fs_mgr_priv.h"
struct fs_mgr_flag_values {
@@ -330,6 +332,23 @@
fstab->recs[cnt].partnum = flag_vals.partnum;
fstab->recs[cnt].swap_prio = flag_vals.swap_prio;
fstab->recs[cnt].zram_size = flag_vals.zram_size;
+
+ /* If an A/B partition, modify block device to be the real block device */
+ if (fstab->recs[cnt].fs_mgr_flags & MF_SLOTSELECT) {
+ char propbuf[PROPERTY_VALUE_MAX];
+ char *tmp;
+
+ /* use the kernel parameter if set */
+ property_get("ro.boot.slot_suffix", propbuf, "");
+
+ if (asprintf(&tmp, "%s%s", fstab->recs[cnt].blk_device, propbuf) > 0) {
+ free(fstab->recs[cnt].blk_device);
+ fstab->recs[cnt].blk_device = tmp;
+ } else {
+ ERROR("Error updating block device name\n");
+ goto err;
+ }
+ }
cnt++;
}
/* If an A/B partition, modify block device to be the real block device */