diff options
| author | Luk1337 <luk1337@cyanogenmod.org> | 2016-12-11 12:15:10 +0100 |
|---|---|---|
| committer | Joey Rizzoli <joey@cyanogenmoditalia.it> | 2016-12-18 18:17:51 +0100 |
| commit | 4a21ec0767da2cd9fcf963e07fb932048ede9bf9 (patch) | |
| tree | 029d3b466d065b960ffbdb263f92e2782066a825 | |
| parent | d56c250228ace03769e7ceee74cd4c6a3a587b19 (diff) | |
cancro: set bootdevice
Change-Id: I3e263baaa2fbaae367b160e547bcefcd51594231
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rwxr-xr-x | rootdir/root/fstab.qcom | 16 | ||||
| -rwxr-xr-x | rootdir/root/init.target.rc | 11 |
3 files changed, 13 insertions, 16 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index fbaf8ef..3b54a2b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -45,7 +45,7 @@ BOARD_GLOBAL_CFLAGS += -D__ARM_USE_PLD -D__ARM_CACHE_LINE_SIZE=64 -DUSE_RIL_VE BOARD_GLOBAL_CPPFLAGS += -DUSE_RIL_VERSION_10 # Kernel -BOARD_KERNEL_CMDLINE := console=none vmalloc=340M androidboot.hardware=qcom msm_rtb.filter=0x3b7 ehci-hcd.park=3 +BOARD_KERNEL_CMDLINE := console=none vmalloc=340M androidboot.hardware=qcom msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 BOARD_KERNEL_SEPARATED_DT := true BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 2048 diff --git a/rootdir/root/fstab.qcom b/rootdir/root/fstab.qcom index 2f07e84..b1db905 100755 --- a/rootdir/root/fstab.qcom +++ b/rootdir/root/fstab.qcom @@ -1,13 +1,13 @@ # Android fstab file. # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/dev/block/platform/msm_sdcc.1/by-name/system /system ext4 ro wait -/dev/block/platform/msm_sdcc.1/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr wait,check -/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check -/dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/bk1,reservedsize=128M -/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/bk1,reservedsize=128M -/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults -/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults +/dev/block/bootdevice/by-name/system /system ext4 ro wait +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr wait,check +/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr wait,check,encryptable=/dev/block/bootdevice/by-name/bk1,reservedsize=128M +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,noauto_da_alloc wait,check,encryptable=/dev/block/bootdevice/by-name/bk1,reservedsize=128M +/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults +/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /devices/platform/xhci-hcd/usb1* auto auto defaults voldmanaged=usb:auto diff --git a/rootdir/root/init.target.rc b/rootdir/root/init.target.rc index d774472..a7c86ca 100755 --- a/rootdir/root/init.target.rc +++ b/rootdir/root/init.target.rc @@ -47,18 +47,15 @@ on fs # these partition flashed on the device. Failure to mount any partition in fstab file # results in failure to launch late-start class. - wait /dev/block/platform/msm_sdcc.1/by-name/cache - mount ext4 /dev/block/platform/msm_sdcc.1/by-name/cache /cache nosuid nodev barrier=1 - - wait /dev/block/platform/msm_sdcc.1/by-name/persist - mount ext4 /dev/block/platform/msm_sdcc.1/by-name/persist /persist nosuid nodev barrier=1 + wait /dev/block/bootdevice/by-name/persist + mount ext4 /dev/block/bootdevice/by-name/persist /persist nosuid nodev barrier=1 restorecon_recursive /persist mkdir /persist/data 0700 system system mkdir /persist/data/sfs 0700 system system mkdir /persist/data/tz 0700 system system - wait /dev/block/platform/msm_sdcc.1/by-name/modem - mount vfat /dev/block/platform/msm_sdcc.1/by-name/modem /firmware ro context=u:object_r:firmware_file:s0,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 + wait /dev/block/bootdevice/by-name/modem + mount vfat /dev/block/bootdevice/by-name/modem /firmware ro context=u:object_r:firmware_file:s0,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 on post-fs-data mkdir /data/tombstones 0771 system system |