From 14da1dae25e747243e3a83fd3760e78abdaa2372 Mon Sep 17 00:00:00 2001 From: Vachounet Date: Mon, 15 Jan 2018 09:53:24 +0100 Subject: [PATCH] sanders: move init.*.rc to vendor * Early mount /system * Create a dedicated fstab for TWRP * Load fstab from vendor * Move also ueventd.qcom to vendor Change-Id: Ifcefd31dcbcf562efc6359e1fa1e155d24d802e5 --- BoardConfig.mk | 2 +- device.mk | 4 +++- rootdir/Android.mk | 16 ++++------------ rootdir/etc/fstab.qcom | 2 +- rootdir/etc/fstab.recovery | 22 ++++++++++++++++++++++ rootdir/etc/init.mmi.rc | 3 ++- rootdir/etc/init.qcom.rc | 4 ++-- 7 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 rootdir/etc/fstab.recovery diff --git a/BoardConfig.mk b/BoardConfig.mk index bea6cac..764d794 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -201,7 +201,7 @@ BOARD_USES_QC_TIME_SERVICES := true # Recovery BOARD_HAS_NO_SELECT_BUTTON := true -TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom +TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.recovery TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/device.mk b/device.mk index 459afcf..2208fb7 100644 --- a/device.mk +++ b/device.mk @@ -315,7 +315,9 @@ PRODUCT_PACKAGES += \ init.mmi.rc \ init.mmi.usb.rc \ init.qcom.rc \ - ueventd.qcom.rc + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:system/vendor/ueventd.rc # Powerhint configuration file PRODUCT_COPY_FILES += \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk index ccfab97..30e8f03 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -57,7 +57,7 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -65,7 +65,7 @@ LOCAL_MODULE := init.mmi.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.mmi.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -73,7 +73,7 @@ LOCAL_MODULE := init.mmi.usb.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.mmi.usb.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -81,13 +81,5 @@ LOCAL_MODULE := init.qcom.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := ueventd.qcom.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/ueventd.qcom.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index a7e06db..32f6327 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -6,7 +6,7 @@ # Currently we dont have e2fsck compiled. So fs check would failed. # -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1,discard wait +# /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1,discard wait /dev/block/bootdevice/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata /dev/block/bootdevice/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,barrier=1,data=ordered wait,check,formattable /dev/block/bootdevice/by-name/modem /firmware ext4 ro,nosuid,nodev,barrier=0 wait diff --git a/rootdir/etc/fstab.recovery b/rootdir/etc/fstab.recovery new file mode 100644 index 0000000..84a0c33 --- /dev/null +++ b/rootdir/etc/fstab.recovery @@ -0,0 +1,22 @@ +# 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 + +#TODO: Add 'check' as fs_mgr_flags with data partition. +# Currently we dont have e2fsck compiled. So fs check would failed. + +# +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1,discard wait +/dev/block/bootdevice/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata +/dev/block/bootdevice/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,barrier=1,data=ordered wait,check,formattable +/dev/block/bootdevice/by-name/modem /firmware ext4 ro,nosuid,nodev,barrier=0,context=u:object_r:firmware_file:s0 wait +/dev/block/bootdevice/by-name/fsg /fsg ext4 ro,nosuid,nodev,context=u:object_r:fsg_file:s0 wait +/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait +/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1,noatime,noauto_da_alloc,context=u:object_r:persist_file:s0 wait +/dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly +/dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults + +/devices/soc/7864900.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=userdata +/devices/*/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usb:auto +/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc index 09a0725..f679ede 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -1,5 +1,5 @@ # Moto USB configuration -import /init.mmi.usb.rc +import /system/vendor/etc/init/hw/init.mmi.usb.rc on early-boot write /sys/module/subsystem_restart/parameters/disable_restart_work 0x0 @@ -65,6 +65,7 @@ on post-fs chmod 0711 /persist/rfs/msm/mpss chmod 0771 /persist/rfs/msm/mpss/mot_rfs + swapon_all /system/vendor/etc/fstab.qcom write /proc/sys/vm/page-cluster 0 on post-fs-data diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 29eb8f6..dc4e5c2 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -import /init.mmi.rc +import /system/vendor/etc/init/hw/init.mmi.rc on early-init mount tracefs tracefs /sys/kernel/tracing @@ -42,7 +42,7 @@ on fs wait /dev/block/platform/soc/${ro.boot.bootdevice} symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice - mount_all fstab.qcom + mount_all /system/vendor/etc/fstab.qcom write /proc/sys/vm/swappiness 100 # Keeping following partitions outside fstab file. As user may not have