From 51e777cc1d0463e63b7e072b81595e9146d63e9e Mon Sep 17 00:00:00 2001 From: therootlord Date: Thu, 8 Nov 2018 15:31:27 -0200 Subject: [PATCH] sanders: update for the new mount points * Also bind mount /mnt/vendor/persist to /persist for backward compatibility --- Android.mk | 48 +++++++++++++++---------- rootdir/etc/fstab.qcom | 1 + rootdir/etc/init.mmi.rc | 76 ++++++++++++++++++++-------------------- rootdir/etc/init.qcom.rc | 17 ++++----- 4 files changed, 78 insertions(+), 64 deletions(-) diff --git a/Android.mk b/Android.mk index 8820db5..8d3f2b6 100644 --- a/Android.mk +++ b/Android.mk @@ -17,6 +17,18 @@ ifneq ($(filter sanders,$(TARGET_DEVICE)),) LOCAL_PATH := $(call my-dir) +FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt +DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp +ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) \ + $(DSP_MOUNT_POINT) +$(FIRMWARE_MOUNT_POINT): + @echo "Creating $(FIRMWARE_MOUNT_POINT)" + @mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt + +$(DSP_MOUNT_POINT): + @echo "Creating $(DSP_MOUNT_POINT)" + @mkdir -p $(TARGET_OUT_VENDOR)/dsp + FIRMWARE_ADSP_IMAGES := \ adsp.b00 adsp.b01 adsp.b02 adsp.b03 adsp.b04 adsp.b05 adsp.b06 \ adsp.b07 adsp.b08 adsp.b09 adsp.b10 adsp.b11 adsp.b12 adsp.b13 \ @@ -27,7 +39,7 @@ $(FIRMWARE_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "ADSP Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_ADSP_SYMLINKS) @@ -39,7 +51,7 @@ $(FIRMWARE_CPPF_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Fingerprint Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_CPPF_SYMLINKS) @@ -53,7 +65,7 @@ $(FIRMWARE_FINGERPRINT_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Fingerprint Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_FINGERPRINT_SYMLINKS) @@ -68,7 +80,7 @@ $(FIRMWARE_MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Modem Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MODEM_SYMLINKS) @@ -81,7 +93,7 @@ $(FIRMWARE_WCNSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "WCNSS Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WCNSS_SYMLINKS) @@ -94,7 +106,7 @@ $(FIRMWARE_WIDEVINE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Widevine Firmware link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ + $(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WIDEVINE_SYMLINKS) @@ -104,10 +116,10 @@ $(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps - $(hide) ln -sf /persist/rfs/msm/adsp $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(hide) ln -sf /mnt/vendor/persist/rfs/msm/adsp $@/readwrite + $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared + $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos + $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware RFS_MSM_SLPI_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/slpi/ @@ -116,10 +128,10 @@ $(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/lpass $@/ramdumps - $(hide) ln -sf /persist/rfs/msm/slpi $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(hide) ln -sf /mnt/vendor/persist/rfs/msm/slpi $@/readwrite + $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared + $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos + $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware RFS_MSM_MPSS_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/mpss/ @@ -128,10 +140,10 @@ $(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @rm -rf $@/* @mkdir -p $(dir $@)/readonly/vendor $(hide) ln -sf /data/vendor/tombstones/rfs/modem $@/ramdumps - $(hide) ln -sf /persist/rfs/msm/mpss $@/readwrite - $(hide) ln -sf /persist/rfs/shared $@/shared - $(hide) ln -sf /persist/hlos_rfs/shared $@/hlos - $(hide) ln -sf /firmware $@/readonly/firmware + $(hide) ln -sf /mnt/vendor/persist/rfs/msm/mpss $@/readwrite + $(hide) ln -sf /mnt/vendor/persist/rfs/shared $@/shared + $(hide) ln -sf /mnt/vendor/persist/hlos_rfs/shared $@/hlos + $(hide) ln -sf /vendor/firmware_mnt $@/readonly/firmware $(hide) ln -sf /vendor/firmware $@/readonly/vendor/firmware ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 68ead0e..4e8a72c 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -16,6 +16,7 @@ /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 +/mnt/vendor/persist /persist none bind wait /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 diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc index 4c76297..8236374 100644 --- a/rootdir/etc/init.mmi.rc +++ b/rootdir/etc/init.mmi.rc @@ -22,53 +22,53 @@ on fs symlink /persist /pds on post-fs - mkdir /persist/camera 0755 oem_5004 oem_5004 - mkdir /persist/camera/focus 0775 camera oem_5004 - mkdir /persist/camera/ledcal 0775 camera oem_5004 - mkdir /persist/batt_health 0755 oem_5001 oem_5001 - mkdir /persist/mdm 0770 radio radio - mkdir /persist/factory 0755 oem_5004 oem_5004 - mkdir /persist/factory/audio 0755 oem_5004 system - mkdir /persist/factory/wlan 0755 oem_5004 oem_5004 - mkdir /persist/factory/regulatory 0755 oem_5004 system - mkdir /persist/public 0755 oem_5004 oem_5004 + mkdir /mnt/vendor/persist/camera 0755 oem_5004 oem_5004 + mkdir /mnt/vendor/persist/camera/focus 0775 camera oem_5004 + mkdir /mnt/vendor/persist/camera/ledcal 0775 camera oem_5004 + mkdir /mnt/vendor/persist/batt_health 0755 oem_5001 oem_5001 + mkdir /mnt/vendor/persist/mdm 0770 radio radio + mkdir /mnt/vendor/persist/factory 0755 oem_5004 oem_5004 + mkdir /mnt/vendor/persist/factory/audio 0755 oem_5004 system + mkdir /mnt/vendor/persist/factory/wlan 0755 oem_5004 oem_5004 + mkdir /mnt/vendor/persist/factory/regulatory 0755 oem_5004 system + mkdir /mnt/vendor/persist/public 0755 oem_5004 oem_5004 mkdir /persist/public/atvc 0770 oem_5012 shell - mkdir /persist/public/battd 0755 oem_5000 oem_5004 - mkdir /persist/public/att_dm 0775 radio oem_5004 - mkdir /persist/public/hiddenmenu 0775 radio oem_5004 - mkdir /persist/public/hiddenmenu/data 0775 system oem_5004 + mkdir /mnt/vendor/persist/public/battd 0755 oem_5000 oem_5004 + mkdir /mnt/vendor/persist/public/att_dm 0775 radio oem_5004 + mkdir /mnt/vendor/persist/public/hiddenmenu 0775 radio oem_5004 + mkdir /mnt/vendor/persist/public/hiddenmenu/data 0775 system oem_5004 mkdir /persist/public/locale 0700 system system mkdir /persist/public/omadm 0700 radio radio mkdir /persist/public/svcs 0770 system system - mkdir /persist/wifi 0755 oem_5004 oem_5004 - mkdir /persist/bt 0755 oem_5004 bluetooth - mkdir /persist/wmdrm 0775 oem_5003 oem_5003 + mkdir /mnt/vendor/persist/wifi 0755 oem_5004 oem_5004 + mkdir /mnt/vendor/persist/bt 0755 oem_5004 bluetooth + mkdir /mnt/vendor/persist/wmdrm 0775 oem_5003 oem_5003 mkdir /persist/public/usc_dm 0775 radio radio mkdir /persist/sds 0700 vold vold - mkdir /persist/rfs/msm/mpss/mot_rfs 0771 rfs system + mkdir /mnt/vendor/persist/rfs/msm/mpss/mot_rfs 0771 rfs system # This dir is used to store any OMA(both DM and CP) files in persist partition # Any app with radio UID or oem_5004 GID can read/write/execute files in this dir. - mkdir /persist/public/oma 0775 radio oem_5004 + mkdir /mnt/vendor/persist/public/oma 0775 radio oem_5004 - chown oem_5004 oem_5004 /persist/factory/fti - chmod 0660 /persist/factory/fti - chown oem_5004 oem_5004 /persist/factory/byte - chmod 0660 /persist/factory/byte - chmod 0660 /persist/wifi/wlan_mac.bin - chown oem_5004 oem_5004 /persist/bt/bt_bdaddr - chmod 0664 /persist/bt/bt_bdaddr + chown oem_5004 oem_5004 /mnt/vendor/persist/factory/fti + chmod 0660 /mnt/vendor/persist/factory/fti + chown oem_5004 oem_5004 /mnt/vendor/persist/factory/byte + chmod 0660 /mnt/vendor/persist/factory/byte + chmod 0660 /mnt/vendor/persist/wifi/wlan_mac.bin + chown oem_5004 oem_5004 /mnt/vendor/persist/bt/bt_bdaddr + chmod 0664 /mnt/vendor/persist/bt/bt_bdaddr # Set life_calls and life_timer file permissions - chown radio oem_5004 /persist/public/hiddenmenu/life_calls - chmod 0775 /persist/public/hiddenmenu/life_calls - chown radio oem_5004 /persist/public/hiddenmenu/life_timer - chmod 0775 /persist/public/hiddenmenu/life_timer + chown radio oem_5004 /mnt/vendor/persist/public/hiddenmenu/life_calls + chmod 0775 /mnt/vendor/persist/public/hiddenmenu/life_calls + chown radio oem_5004 /mnt/vendor/persist/public/hiddenmenu/life_timer + chmod 0775 /mnt/vendor/persist/public/hiddenmenu/life_timer - chmod 0711 /persist/rfs - chmod 0711 /persist/rfs/msm - chmod 0711 /persist/rfs/msm/mpss - chmod 0771 /persist/rfs/msm/mpss/mot_rfs + chmod 0711 /mnt/vendor/persist/rfs + chmod 0711 /mnt/vendor/persist/rfs/msm + chmod 0711 /mnt/vendor/persist/rfs/msm/mpss + chmod 0771 /mnt/vendor/persist/rfs/msm/mpss/mot_rfs write /proc/sys/vm/page-cluster 0 @@ -230,10 +230,10 @@ on boot write /sys/module/binder/parameters/debug_mask 0x5 # Clear cooldown state - mkdir /persist/chargeonly 0770 system system - write /persist/chargeonly/cooldown n - chown system system /persist/chargeonly/cooldown - chmod 0660 /persist/chargeonly/cooldown + mkdir /mnt/vendor/persist/chargeonly 0770 system system + write /mnt/vendor/persist/chargeonly/cooldown n + chown system system /mnt/vendor/persist/chargeonly/cooldown + chmod 0660 /mnt/vendor/persist/chargeonly/cooldown # Pass carrier to wlan service vendor.init_wifi /vendor/bin/sh /vendor/bin/wlan_carrier_bin.sh diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index c8d8784..50d6b80 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -1,4 +1,4 @@ -# Copyright (c) 2009-2012, 2014-2016, The Linux Foundation. All rights reserved. +# Copyright (c) 2009-2012, 2014-2018, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -31,10 +31,13 @@ import /vendor/etc/init/hw/init.sanders.rc on early-init mount debugfs debugfs /sys/kernel/debug chmod 0755 /sys/kernel/debug - mkdir /firmware 0771 system system mkdir /system 0777 root root symlink /data/tombstones /tombstones - mkdir /dsp 0771 media media + + # create symlink for vendor mount points + symlink /vendor/firmware_mnt /firmware + symlink /vendor/dsp /dsp + chown root system /dev/kmsg chmod 0620 /dev/kmsg @@ -51,14 +54,12 @@ on fs mkdir /mnt/vendor/persist/bms 0700 root system restorecon_recursive /mnt/vendor/persist - wait /dev/block/bootdevice/by-name/dsp - restorecon_recursive /dsp - on init write /sys/module/qpnp_rtc/parameters/poweron_alarm 1 # Set permissions for persist partition mkdir /persist 0771 root system + mkdir /mnt/vendor/persist 0771 root system # Create cgroup mount point for memory mkdir /sys/fs/cgroup/memory/bg 0750 root system @@ -176,7 +177,7 @@ on boot mkdir /persist/misc 0770 system system mkdir /persist/alarm 0770 system system mkdir /persist/time 0770 system system - mkdir /persist/secnvm 0770 system system + mkdir /mnt/vendor/persist/secnvm 0770 system system #Create NETMGR daemon socket area mkdir /dev/socket/netmgr 0750 radio radio @@ -305,7 +306,7 @@ on boot mkdir /persist/display 0770 system graphics # Create vpp directory - mkdir /persist/vpp 0770 media media + mkdir /mnt/vendor/persist/vpp 0770 media media # msm specific files that need to be created on /data on post-fs-data