From: Jan Altensen <info@stricted.net>
Date: Mon, 18 May 2020 18:47:53 +0000 (+0200)
Subject: exynos9610: cleanup init files
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fda2aa331260385d3bed978b5b8b760916a52089;p=GitHub%2Fmoto-9609%2Fandroid_device_motorola_exynos9610-common.git

exynos9610: cleanup init files

Change-Id: I48bd976731325aee56b48b8bc533aecdbbf40715
---

diff --git a/common.mk b/common.mk
index e68e921..24364b7 100644
--- a/common.mk
+++ b/common.mk
@@ -107,30 +107,17 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/init/carrier/init.default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/carrier/init.default.rc \
     $(COMMON_PATH)/configs/init/carrier/init.retin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/carrier/init.retin.rc \
-    $(COMMON_PATH)/configs/init/hw/init.mmi.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.mmi.debug.rc \
     $(COMMON_PATH)/configs/init/hw/init.mmi.overlay.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.mmi.overlay.rc \
-    $(COMMON_PATH)/configs/init/dmd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dmd.rc \
     $(COMMON_PATH)/configs/init/init.ets.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.ets.rc \
     $(COMMON_PATH)/configs/init/init.exynos.sensorhub.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.exynos.sensorhub.rc \
     $(COMMON_PATH)/configs/init/init.exynos9610.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.exynos9610.rc \
     $(COMMON_PATH)/configs/init/init.exynos9610.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.exynos9610.usb.rc \
     $(COMMON_PATH)/configs/init/init.mmi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.mmi.rc \
-    $(COMMON_PATH)/configs/init/init.mot-factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.mot-factory.rc \
     $(COMMON_PATH)/configs/init/init.nfc.sec.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.nfc.sec.rc \
     $(COMMON_PATH)/configs/init/init.recovery.exynos9610.rc:$(TARGET_COPY_OUT_ROOT)/init.recovery.exynos9610.rc \
     $(COMMON_PATH)/configs/init/mobicore.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mobicore.rc \
-    $(COMMON_PATH)/configs/init/mplog.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mplog.rc \
-    $(COMMON_PATH)/configs/init/rfsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/rfsd.rc \
     $(COMMON_PATH)/configs/init/rild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/rild.rc \
-    $(COMMON_PATH)/configs/init/sced.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/sced.rc \
-    $(COMMON_PATH)/configs/init/sctd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/sctd.rc \
-    $(COMMON_PATH)/configs/init/smcd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/smcd.rc \
-    $(COMMON_PATH)/configs/init/spad.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/spad.rc \
-    $(COMMON_PATH)/configs/init/swcnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/swcnd.rc \
-    $(COMMON_PATH)/configs/init/tcmd.receiver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tcmd.receiver.rc \
-    $(COMMON_PATH)/configs/init/tcmd.simulater.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tcmd.simulater.rc \
     $(COMMON_PATH)/configs/init/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
-    $(COMMON_PATH)/configs/init/vcd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vcd.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
 
diff --git a/configs/init/dmd.rc b/configs/init/dmd.rc
deleted file mode 100644
index 2476553..0000000
--- a/configs/init/dmd.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-# DM daemon
-    service DM-daemon /vendor/bin/dmd
-    class main
-    user system 
-    group system media_rw sdcard_rw
-    seclabel u:r:dmd:s0
diff --git a/configs/init/hw/init.mmi.debug.rc b/configs/init/hw/init.mmi.debug.rc
deleted file mode 100644
index 3c36b40..0000000
--- a/configs/init/hw/init.mmi.debug.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-on boot && property:ro.boot.adb_early=1
-    start vendor.mmi-usb-sh
-
diff --git a/configs/init/hw/init.mmi.overlay.rc b/configs/init/hw/init.mmi.overlay.rc
index c70690f..9b6df5e 100644
--- a/configs/init/hw/init.mmi.overlay.rc
+++ b/configs/init/hw/init.mmi.overlay.rc
@@ -18,16 +18,6 @@ on boot
    chown system camera /mnt/vendor/persist/camera/dualcal/module_id.bin
    chmod 0664 /mnt/vendor/persist/camera/dualcal/dual_cal_data.bin
    chmod 0664 /mnt/vendor/persist/camera/dualcal/module_id.bin
-   start ufs_ffu
-
-service capsense_reset /vendor/bin/capsense_reset
-    class core
-    user system
-    group system input
-    disabled
-
-on property:sys.boot_completed=1
-  start capsense_reset
 
 on property:ro.carrier=tmo
   write /sys/class/power_supply/battery/device/force_max_chrg_temp 55
@@ -35,11 +25,3 @@ on property:ro.carrier=tmo
 on property:ro.carrier=metropcs
   write /sys/class/power_supply/battery/device/force_max_chrg_temp 55
 
-service ufs_ffu /vendor/bin/ufs_ffu.sh
-    user root
-    class core
-    oneshot
-    disabled
-
-on property:vendor.ufs_need_ffu=1
-    setprop sys.dbg.ufs_ffu_start 1
diff --git a/configs/init/init.exynos9610.rc b/configs/init/init.exynos9610.rc
index f55ffeb..e98e5b4 100644
--- a/configs/init/init.exynos9610.rc
+++ b/configs/init/init.exynos9610.rc
@@ -176,7 +176,6 @@ on post-fs-data
 # Exynos Data folder
     mkdir /data/vendor 0775 root system
     mkdir /data/vendor/log 0771 root system
-    mkdir /data/vendor/log/cbd 0775 root system
     mkdir /data/vendor/gps 0771 system system
     mkdir /data/vendor/log/gps 0771 system system
     mkdir /data/vendor/log/chub 0771 root system
@@ -468,19 +467,6 @@ service abox /vendor/bin/main_abox 14a50000.abox /data/vendor/log/abox
     user audioserver
     group system
 
-# scsc daemon
-service wlbtd /vendor/bin/wlbtd
-    class main
-    user wifi
-    group wifi inet log sdcard_rw misc diag
-
-# Modem boot daemon
-    service cpboot-daemon /vendor/bin/cbd -p /dev/block/platform/13520000.ufs/by-name/modem${ro.boot.slot_suffix}
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log system diag
-    seclabel u:r:cbd:s0
-
 # GPS daemon
     service gpsd /vendor/bin/hw/gpsd
     class main
@@ -563,30 +549,12 @@ service iprenew_bt-pan /vendor/bin/dhcpcd -n
         oneshot
 
 # IMS WiFi Calling [START] #
-service charonservice /system/vendor/bin/charon
+service charonservice /vendor/bin/charon
         class main
         user root
         disabled
         seclabel u:r:charonservice:s0
 
-# bugreport is triggered by holding down volume down, volume up and power
-service bugreport /system/bin/dumpstate -d -p -B -z \
-        -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
-    class main
-    disabled
-    oneshot
-    keycodes 114 115 116
-
-# daemon for saving offline ramdump data
-service dssd /vendor/bin/dssd ramdump
-    class late_start
-    user root
-    group root system
-    oneshot
-    file /data/vendor/ramdump "r"
-    file /dev/block/by-name/ramdump "r"
-    seclabel u:r:dssd:s0
-
 on property:vendor.charon=1
     rm /data/vendor/misc/vpn/charon.pid
     chmod 0666 /dev/tun
@@ -637,12 +605,6 @@ service exynos-thermald /vendor/bin/exynos-thermald
 	file /sys/class/thermal/thermal_zone0 "r"
 	seclabel u:r:exynos-thermald:s0
 
-service vendor.mmi-usb-sh /vendor/bin/init.mmi.usb.sh
-    class late_start
-    user root
-    group system
-oneshot
-
 # Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
 service watchdogd /sbin/watchdogd 10 20
     class core
diff --git a/configs/init/init.mmi.rc b/configs/init/init.mmi.rc
index 1a8b841..4068afe 100644
--- a/configs/init/init.mmi.rc
+++ b/configs/init/init.mmi.rc
@@ -4,23 +4,6 @@ import /vendor/etc/init/hw/init.mmi.chipset.rc
 # Target-specific file
 import /vendor/etc/init/hw/init.mmi.overlay.rc
 
-# Moto USB configuration
-#import /vendor/etc/init/hw/init.mmi.usb.rc
-# Moto debugging
-import /vendor/etc/init/hw/init.mmi.debug.rc
-
-
-
-#import /vendor/etc/init/hw/init.oem.rc
-#import /vendor/etc/init/hw/init.mmi.common.rc
-#import /vendor/etc/init/hw/init.mmi.nonab.rc
-
-# Moto verified boot extension
-#import /vendor/etc/init/hw/init.mmi.hab.rc
-
-# Test commands
-import /vendor/etc/init/hw/init.mmi.tcmd.rc
-
 # Carrier specific script
 # Begin moto, huangzye 2019.08.29 IKSWQ-7064
 import /vendor/etc/init/carrier/init.${ro.boot.carrier}.rc
@@ -281,35 +264,6 @@ on boot
    chmod 0666 sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
    chmod 0666 sys/devices/system/cpu/cpufreq/policy4/scaling_max_freq
 
-service vendor.mmi-block-perm /vendor/bin/init.mmi.block_perm.sh
-    class main
-    user root
-    oneshot
-
-
-service vendor.pstore_annotate /vendor/bin/pstore_annotate.sh build
-    class main
-    group log
-    oneshot
-
-service vendor.apanic_copy /vendor/bin/apanic_copy.sh
-    class late_start
-    group log
-    oneshot
-    disabled
-
-service vendor.bl_logs_copy /vendor/bin/apanic_copy.sh -i
-    class late_start
-    group log
-    oneshot
-    disabled
-
-on property:sys.boot_completed=1 && property:ro.bootmode=bp-tools
-   start VC-daemon
-
-on property:sys.boot_completed=1 && property:ro.bootmode=mot-factory
-   start VC-daemon
-
 # For not to impact boot completed broadcast, set cpusets after broadcast.
 on property:sys.bootbroadcast_completed=1
     write /dev/cpuset/foreground/cpus 0-7
@@ -346,171 +300,18 @@ on moto-charger
     start batt_health
     start thermal-com
 
-service vendor.apanic_annotate /vendor/bin/apanic_save.sh build
-    class late_start
-    group log
-    oneshot
-    disabled
-
-#service vendor.batt_health /vendor/bin/batt_health
-#    class late_start
-#    user vendor_pwric
-#    group vendor_pwric cache net_admin log
-#    disabled
-
-on property:ro.vendor.bootreason=coldboot
-    start vendor.apanic_copy
-
-on property:ro.vendor.bootreason=watchdog
-    stop surfaceflinger
-    stop zygote
-    stop zygote_secondary
-    stop sensors
-    start vendor.apanic_annotate
-
-on property:ro.vendor.bootreason=pmic_watchdog
-    stop surfaceflinger
-    stop zygote
-    stop zygote_secondary
-    stop sensors
-    start vendor.apanic_annotate
-
-on property:ro.vendor.bootreason=kernel_panic
-    stop surfaceflinger
-    stop zygote
-    stop zygote_secondary
-    stop sensors
-    start vendor.apanic_annotate
-
-on property:persist.vendor.log.aplogd.enable=1
-    start vendor.aplogd
-
-on property:persist.vendor.log.aplogd.enable=0
-    stop vendor.aplogd
-
-service vendor.aplogd /vendor/bin/aplogd
-    class late_start
-    #user log
-    #group log system sdcard_rw sdcard_r media_rw mount
-    # The user and group definitions above are intentionally disabled and left
-    # only as documentation. It actually starts as root and immediately drops
-    # to log plus those groups after preserving CAP_SYS_ADMIN, which is required
-    # for kernel logging.
-    disabled
-
 # from P onwards aplogd cannot read vold.post_fs_data_done so a new property
 # shall be used to allow aplogd checking if FBE has finished /data decryption
 on property:vold.post_fs_data_done=*
      setprop vendor.vold.post_fs_data_done ${vold.post_fs_data_done}
 
-service vendor.mmi-boot-sh /vendor/bin/init.mmi.boot.sh
-    class core
-    user root
-    oneshot
-
 on property:ro.vendor.hw.dualsim=true
    setprop persist.radio.multisim.config dsds
 
 on property:ro.vendor.hw.dualsim=false
    setprop persist.radio.multisim.config ""
 
-service vendor.mbm_spy /vendor/bin/mbm_spy
-    class late_start
-    user system
-    group system
-    oneshot
-    disabled
-
-on property:sys.boot_completed=1
-    start vendor.mbm_spy
-
-service dropboxd /vendor/bin/dropboxd
-    class late_start
-    user diag
-    group diag
-
-service vendor.hw_revs /vendor/bin/hardware_revisions.sh
-    class late_start
-    user system
-    group system
-    oneshot
-
-service vendor.mmi-touch-sh /vendor/bin/init.mmi.touch.sh
-    class core
-    user root
-    oneshot
-
-service vendor.oem-hw-sh /vendor/bin/init.oem.hw.sh
-    class core
-    user root
-    oneshot
-    disabled
-
-#service vendor.touch-dead-sh /vendor/bin/init.oem.hw.sh -f
-#    class main
-#    user root
-#    oneshot
-#    disabled
-
-#service vendor.touch-ready-sh /vendor/bin/init.oem.hw.sh -r
-#    class main
-#    user root
-#    oneshot
-#    disabled
-
-#service vendor.oem-hw-config-sh /vendor/bin/init.oem.hw.sh -p
-#    class main
-#    user root
-#    oneshot
-#    disabled
-
-#on property:vendor.hw.touch.status="dead"
-#    start vendor.touch-dead-sh
-
-#on property:vendor.hw.touch.status="ready"
-#    start vendor.touch-ready-sh
-
 service vendor.charge_only_mode /vendor/bin/charge_only_mode
     user root
     group graphics system input
     disabled
-
-#service vendor.thermal-com /vendor/bin/thermal-engine --minimode
-#    class main
-#    user root
-#    disabled
-
-
-# bugreport is triggered by holding down volume down, volume up and power
-service bugreport /system/bin/dumpstate -d -p -B -z \
-        -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
-    class main
-    disabled
-    oneshot
-    keycodes 114 115 116
-
-
-#on property:vendor.wifi.tethering=false
-#    write /sys/module/wlan/parameters/fwpath apdown
-
-# Override the AOSP sensor HAL service definition to add input group access
-#service vendor.sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service
-#    class hal
-#    user system
-#    group system input wakelock
-#    capabilities BLOCK_SUSPEND
-#    rlimit rtprio 10 10
-
-#Override fwpath string when wpa_supplicant server was killed
-#on property:init.svc.wpa_supplicant=running
-#    write /sys/module/wlan/parameters/fwpath sta
-
-#on property:init.svc.wpa_supplicant=stopped
-#    write /sys/module/wlan/parameters/fwpath wpadown
-
-# androidboot.hardware.sku represents the SKU name being used for Regulatory approval (e.g. XT1101-01).
-# This property is used in AOSP for the Settings app to display an appropriate Regulatory E-Label
-# androidboot.product.hardware.sku represents a SKU name to assist the vendor image in determining
-# a unique HW form factor for purposes of determining a unique VINTF manifest
-#on property:ro.boot.hardware.sku=*
-#    setprop ro.boot.product.hardware.sku ${ro.boot.hardware.sku}
diff --git a/configs/init/init.mot-factory.rc b/configs/init/init.mot-factory.rc
deleted file mode 100644
index 6a58b9b..0000000
--- a/configs/init/init.mot-factory.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-
-on early-init && property:ro.bootmode=mot-factory
-    mkdir /mnt/vendor/efsbk 0755 root system
-
-on fs && property:ro.bootmode=mot-factory
-	mount_all /vendor/etc/fstab.mptool
-
-on post-fs-data && property:ro.bootmode=mot-factory
-    restorecon_recursive /mnt/vendor/efsbk
-    chmod 750 /mnt/vendor/efsbk
-
-on boot && property:ro.bootmode=mot-factory
-	class_start factory
-
-
diff --git a/configs/init/mplog.rc b/configs/init/mplog.rc
deleted file mode 100644
index 41e00ae..0000000
--- a/configs/init/mplog.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-
-##off = 0
-##on = 1
-##default 0
-on property:persist.mptool.dumplog.on=*
-	setprop mptool.dumplog.on ${persist.mptool.dumplog.on}
-
-#default 1024
-on property:persist.mptool.log.buffer.size=*
-	setprop mptool.log.buffer.size ${persist.mptool.log.buffer.size}
-
-#verbose	-	0
-#debug	-	1
-#info	-	2
-#warn	-	3
-##default 2
-on property:persist.mptool.log.severity=*
-	setprop mptool.log.severity ${persist.mptool.log.severity}
-
-##off = 0
-##on = 1
-#default 0
-on property:persist.mptool.log.on=*
-	setprop mptool.log.on ${persist.mptool.log.on}
-
-#smcd 0x00010000
-#swcnd 0x00001000
-#spad 0x00000010
-#sctd 0x00000001
-#sfmd 0x00000100
-on property:persist.mptool.log.catgory=*
-	setprop mptool.log.catgory ${persist.mptool.log.catgory}
-
-
diff --git a/configs/init/rfsd.rc b/configs/init/rfsd.rc
deleted file mode 100644
index 4c8c8d2..0000000
--- a/configs/init/rfsd.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-# RFS daemon
-    service RFS-daemon /vendor/bin/rfsd -d
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log
-    seclabel u:r:rfsd:s0
diff --git a/configs/init/rild.rc b/configs/init/rild.rc
index c80b931..a617551 100644
--- a/configs/init/rild.rc
+++ b/configs/init/rild.rc
@@ -1,3 +1,13 @@
+on post-fs-data
+    mkdir /data/vendor/log/cbd 0775 root system
+
+# Modem boot daemon
+service cpboot-daemon /vendor/bin/cbd -p /dev/block/platform/13520000.ufs/by-name/modem${ro.boot.slot_suffix}
+    class main
+    user root
+    group radio cache inet misc audio sdcard_rw log system diag
+    seclabel u:r:cbd:s0
+
 service ril-daemon /vendor/bin/hw/rild_exynos
     class main
     user radio
diff --git a/configs/init/sced.rc b/configs/init/sced.rc
deleted file mode 100644
index f9cddc9..0000000
--- a/configs/init/sced.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-service SCE-daemon /vendor/bin/sced
-    class main
-    user system
-    group system
-    capabilities NET_ADMIN NET_RAW
-    seclabel u:r:sced:s0
diff --git a/configs/init/sctd.rc b/configs/init/sctd.rc
deleted file mode 100644
index a1e4dad..0000000
--- a/configs/init/sctd.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-service sctd /vendor/bin/sctd --json "/vendor/etc/sctd.json"
-    class factory
-    user root
-    group root system bluetooth radio misc
-
diff --git a/configs/init/smcd.rc b/configs/init/smcd.rc
deleted file mode 100644
index de3bd72..0000000
--- a/configs/init/smcd.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service smcd /vendor/bin/smcd -m ${mptool.smcd.mode:-vcd} -t ${mptool.smcd.timeout:-60}
-    class factory
-    user system
-    group system radio
-
diff --git a/configs/init/spad.rc b/configs/init/spad.rc
deleted file mode 100644
index 6224324..0000000
--- a/configs/init/spad.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service SPA-daemon  /vendor/bin/spad
-    class factory
-    group system root radio cache inet misc audio log
-    user root
-
diff --git a/configs/init/swcnd.rc b/configs/init/swcnd.rc
deleted file mode 100644
index c0f0e29..0000000
--- a/configs/init/swcnd.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-on post-fs-data && property:ro.bootmode=sfactory
-	setprop sys.boot_completed 1
-
-service swcnd /vendor/bin/swcnd --json "/vendor/etc/swcnd.json"
-    class factory
-    user root
-    group system bluetooth radio misc
-
diff --git a/configs/init/tcmd.receiver.rc b/configs/init/tcmd.receiver.rc
deleted file mode 100644
index 92a2f49..0000000
--- a/configs/init/tcmd.receiver.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service TCMDReceiver /vendor/bin/tcmd_receiver
-    class factory
-    user root
-    group system
-
diff --git a/configs/init/tcmd.simulater.rc b/configs/init/tcmd.simulater.rc
deleted file mode 100644
index d263d2f..0000000
--- a/configs/init/tcmd.simulater.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-service tcmd_simulater /vendor/bin/tcmd_simulater
-    class simulater
-    user root
-    group root system bluetooth radio misc
-
diff --git a/configs/init/vcd.rc b/configs/init/vcd.rc
deleted file mode 100644
index bb1a177..0000000
--- a/configs/init/vcd.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-# VC daemon
-    service VC-daemon /vendor/bin/vcd
-    class late_start
-    user system
-    group system
-    seclabel u:r:vcd:s0
-    disabled