exynos9610: Switch to two-stage init mounting

* Stop handling vendor mounting from kernel, first stage init is gonna
  do that, together with system (which is now /system)
* Use correct mount flags coming from kernel dts
* Move system and vendor mount points to /dev/block/by-name/, we don't
  have bootdevice symlink to that point in init
* Copy fstab to recovery for first stage init

Change-Id: Iaa0ecc3f13c3cfd3fe357ca509549d0f68a29cf0

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 62bea3d69d8bfcd7e9889a7f440e6000ffc91064..146f27e6929904bf3bc5a2231c9f155a3df2aec2 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -79,7 +79,6 @@ BOARD_DTBO_CFG := $(COMMON_PATH)/configs/dtboimg.cfg
 BOARD_KERNEL_SEPARATED_DTBO  := true
 
 ## Filesystem
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_VENDOR := vendor
 TARGET_FS_CONFIG_GEN += $(COMMON_PATH)/config.fs

diff --git a/common.mk b/common.mk
index 1a51e52bc4783701460ed1ca052f92cf772c0de3..5e761b64e48cc6979c2727b34ae4e2ded59878e9 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -192,7 +192,8 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/init/rild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/rild.rc \
     $(COMMON_PATH)/configs/init/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc \
     $(COMMON_PATH)/configs/init/vendor.mmi.carrier.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mmi.carrier.rc \
-    $(COMMON_PATH)/configs/fstab.exynos9610:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.exynos9610
+    $(COMMON_PATH)/configs/fstab.exynos9610:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.exynos9610 \
+    $(COMMON_PATH)/configs/fstab.exynos9610:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.exynos9610
 
 # Keymaster
 PRODUCT_PACKAGES += \

diff --git a/configs/fstab.exynos9610 b/configs/fstab.exynos9610
index 233e61f8d058523a2f8b4f640903469550518c91..19557ce6c6514799394012e90135d9391b0488b3 100644 (file)
--- a/configs/fstab.exynos9610
+++ b/configs/fstab.exynos9610
@@ -4,7 +4,8 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
 
-/dev/block/bootdevice/by-name/system     /                     ext4    ro                                                  wait,slotselect
+/dev/block/by-name/system                /system               ext4    ro                                                  wait,slotselect,first_stage_mount
+/dev/block/by-name/vendor                /vendor               ext4    ro                                                  wait,slotselect,avb,first_stage_mount
 /dev/block/bootdevice/by-name/userdata   /data                 f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data,reserve_root=32768,resgid=1065   wait,check,formattable,fileencryption=aes-256-xts,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/efs        /mnt/vendor/efs       ext4    noatime,nosuid,nodev,barrier=1,rw                   wait
 /dev/block/bootdevice/by-name/persist    /mnt/vendor/persist   ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait,notrim

diff --git a/recovery.fstab b/recovery.fstab
index ed1063bd965371f76e58abb69e8efc8b6e9ed350..88996bcd62987dc11cad9eeb835a5a46e5225571 100644 (file)
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -4,7 +4,8 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
 
-/dev/block/bootdevice/by-name/system     /                     ext4    ro                                                  wait,slotselect
+/dev/block/by-name/system                /system               ext4    ro                                                  wait,slotselect,first_stage_mount
+/dev/block/by-name/vendor                /vendor               ext4    ro                                                  wait,slotselect,avb,first_stage_mount
 /dev/block/bootdevice/by-name/userdata   /data                 f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data,reserve_root=32768,resgid=1065   wait,check,formattable,fileencryption=aes-256-xts,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/efs        /mnt/vendor/efs       ext4    noatime,nosuid,nodev,barrier=1,rw                   wait
 /dev/block/bootdevice/by-name/persist    /mnt/vendor/persist   ext4    noatime,nosuid,nodev,barrier=1,data=ordered,nodelalloc,nomblk_io_submit,errors=panic wait,notrim