openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "fs_mgr: Add support for A/B partitions" 

The original CL landed on AOSP in 8bb2f36 in August.
It was then removed and superseded by 227ef3c5 in September.
However, 8bb2f36 was then cherry-picked onto mnc-dr2-dev and
automerged back into mnc-dr2-dev-plus-aosp.

This revert CL fixes an issue that was causing init to hang
before mounting any filesystems on edison (and probably
other platforms).

This reverts commit ebff8b97d5, reversing
changes made to d254d33ece.

Change-Id: Ia5b35217c1f4730bccb7374c24089e439d21752d
This commit is contained in:
Jim Guggemos 2015-12-02 08:20:24 -07:00
parent fd3770a5a2
commit fe93f4015e
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs_mgr/fs_mgr_fstab.c
View File

@ -22,8 +22,6 @@
#include <sys/mount.h>
#include <unistd.h>
#include <cutils/properties.h>
#include "fs_mgr_priv.h"
struct fs_mgr_flag_values {
@ -332,23 +330,6 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path)
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 */