gta4xl-common: cleanup init scripts
* Also rename init.exynos9611.root.rc to init.samsung.rc
Change-Id: I3087f71b17924188f421c91b90804c5133a9e48b
diff --git a/common.mk b/common.mk
index f3a9638..f3c0ca0 100644
--- a/common.mk
+++ b/common.mk
@@ -115,9 +115,9 @@
$(COMMON_PATH)/configs/init/fstab.exynos9611:$(TARGET_COPY_OUT_RAMDISK)/fstab.exynos9611 \
$(COMMON_PATH)/configs/init/fstab.exynos9611:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.exynos9611 \
$(COMMON_PATH)/configs/init/init.exynos9611.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.exynos9611.rc \
- $(COMMON_PATH)/configs/init/init.exynos9611.root.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.exynos9611.root.rc \
$(COMMON_PATH)/configs/init/init.exynos9611.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.exynos9611.usb.rc \
$(COMMON_PATH)/configs/init/init.recovery.exynos9611.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.exynos9611.rc \
+ $(COMMON_PATH)/configs/init/init.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.samsung.rc \
$(COMMON_PATH)/configs/init/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
# Keylayout
diff --git a/configs/init/init.exynos9611.rc b/configs/init/init.exynos9611.rc
index 3b7c7cd..cb21626 100644
--- a/configs/init/init.exynos9611.rc
+++ b/configs/init/init.exynos9611.rc
@@ -1,5 +1,3 @@
-import /vendor/etc/init/hw/init.exynos9611.root.rc
-
on early-init
mkdir /mnt/vendor/efs 0771 radio system
mkdir /mnt/vendor/cpefs 0771 radio system
@@ -10,20 +8,6 @@
# Set permissions for persist partition
mkdir /persist 0771 system system
- # See storage config details at http://source.android.com/tech/storage/
- mkdir /storage/sdcard 0000 root root
- mkdir /storage/usb1 0000 root root
- mkdir /storage/usb2 0000 root root
- mkdir /mnt/media_rw/sdcard 0700 media_rw media_rw
- mkdir /mnt/media_rw/usb1 0700 media_rw media_rw
- mkdir /mnt/media_rw/usb2 0700 media_rw media_rw
-
- export SECONDARY_STORAGE /storage/sdcard:/storage/usb1:/storage/usb2
-
- # Support legacy paths
- symlink /storage/sdcard /mnt/ext_sd
- symlink /data/app /factory
-
#Reactivation Lock
symlink /dev/block/platform/13520000.ufs/by-name/steady /dev/block/steady
@@ -334,8 +318,6 @@
chmod 0755 /sys/kernel/debug
chown system system /sys/kernel/debug
- setprop ro.radio.noril no
-
# Set up kernel tracing, but disable it by default
chmod 0222 /sys/kernel/debug/tracing/trace_marker
write /sys/kernel/debug/tracing/tracing_on 0
@@ -521,7 +503,6 @@
restorecon_recursive /mnt/vendor/efs
restorecon_recursive /mnt/vendor/cpefs
restorecon_recursive /mnt/vendor/persist
- restorecon_recursive /data
mkdir /mnt/vendor/persist/data/sfs 0700 system system
mkdir /mnt/vendor/persist/data/tz 0700 system system
@@ -819,12 +800,6 @@
chmod 0660 /sys/class/dp_sec/dp_drm
chown system system /sys/class/dp_sec/dp_drm
-# Copy DRM Key
-# copy /system/app/wv.keys /factory/wv.keys
-
-# Permission for DRM Key
-# chmod 0644 /factory/wv.keys
-
# Permissions for audio
chown system radio /sys/class/audio/earjack/select_jack
chown system radio /sys/class/audio/earjack/key_state
@@ -869,39 +844,12 @@
#load ecd firmware
write /proc/ecd/load_firmware 1
-# faced
-service faced /system/bin/faced
- class late_start
- user system
- group system
-
-service fuse_sdcard /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard /storage/sdcard
- class late_start
- disabled
-service fuse_usb1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usb1 /storage/usb1
- class late_start
- disabled
-service fuse_usb2 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usb2 /storage/usb2
- class late_start
- disabled
-
-# disabled from system sw audio it will be enabled later
-# service abox /vendor/bin/main_abox 14a50000.abox /data/vendor/log/abox
-# class late_start
-# user audioserver
-# group system
-
# Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
service watchdogd /system/bin/watchdogd 10 20
class core
oneshot
seclabel u:r:watchdogd:s0
-# on userdebug and eng builds, enable kgdb on the serial console
-on property:ro.debuggable=1
- write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1
- write /sys/module/fiq_debugger/parameters/kgdb_enable 1
-
on property:ro.bootmode=charger
wait /dev/block/platform/13520000.ufs/by-name/sec_efs
mount ext4 /dev/block/platform/13520000.ufs/by-name/sec_efs /efs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
@@ -914,56 +862,6 @@
mkdir /efs/lpm 0775 system system
class_start sec-charger
-# Sysscope
-service prepare_param /system/bin/prepare_param.sh /dev/block/platform/13520000.ufs/by-name/param
- class core
- user root
- group root
- seclabel u:r:prepare_param:s0
- oneshot
-
-service dhcpcd_wlan0 /vendor/bin/dhcpcd -aABDKL
- class main
- disabled
- oneshot
-
-service iprenew_wlan0 /vendor/bin/dhcpcd -n
- class main
- disabled
- oneshot
-
-service dhcpcd_p2p /vendor/bin/dhcpcd -aABKL
- class main
- disabled
- oneshot
-
-service iprenew_p2p /vendor/bin/dhcpcd -n
- class main
- disabled
- oneshot
-
-# SPE-1748: PANU DHCP Client not launched
-service dhcpcd_bt-pan /vendor/bin/dhcpcd -ABKL
- class main
- disabled
- oneshot
-
-service iprenew_bt-pan /vendor/bin/dhcpcd -n
- class main
- disabled
- oneshot
-
-# Pageboostd
-on property:sys.boot_completed=1
- start pageboostd
-
-service pageboostd /system/bin/pageboostd
- class main
- user system
- group system mount radio net_bt sdcard_rw shell media media_rw
- socket pageboostd seqpacket 0660 system system
- disabled
-
# sensorhub fw
on post-fs
chmod 0770 /spu/sensorhub
diff --git a/configs/init/init.exynos9611.root.rc b/configs/init/init.samsung.rc
similarity index 95%
rename from configs/init/init.exynos9611.root.rc
rename to configs/init/init.samsung.rc
index 3b6aebb..b69ffdd 100644
--- a/configs/init/init.exynos9611.root.rc
+++ b/configs/init/init.samsung.rc
@@ -1,5 +1,3 @@
-import /prism/etc/init/init.rc
-
on init
# for audit message
chown system system /proc/avc_msg
@@ -12,13 +10,6 @@
chown system system /sys/module/sec_debug/parameters/dump_sink
chmod 0600 /sys/module/sec_debug/parameters/dump_sink
- # VOLD FOR ASEC++
- # Directory-target for the ASEC images will be bind-mounted.
- mkdir /mnt/secure/asec 0700 root root
- mount tmpfs tmpfs /mnt/secure/asec mode=0700,uid=0,gid=0
- restorecon_recursive /mnt/secure/asec
- # VOLD FOR ASEC--
-
# reset_reason
chown system system /proc/reset_reason
chmod 0440 /proc/reset_reason
@@ -71,38 +62,20 @@
chmod 0660 /dev/tzic
on post-fs
- # VOLD FOR ASEC++
- mount tmpfs tmpfs /mnt/secure/asec shared rec
- # VOLD FOR ASEC--
-
chown system log /proc/sec_log
# make fsdbg on /dev for filesystem debug info.
mkdir /dev/fsdbg 0775 root system
on post-fs-data
- mark_post_data
-
- # System Parameter Upates
- chown system system /spu
- chmod 0771 /spu
- restorecon /spu
-
# USB conn_gadget device (DeXonPC, Samsung Flow)
chown system system /dev/android_ssusbcon
chmod 0660 /dev/android_ssusbcon
- #start CASS
- start cass
-
chown system radio /efs
chmod 0771 /efs
restorecon /efs
- chown system system /carrier
- chmod 0771 /carrier
- restorecon /carrier
-
# sec_efs_file
mkdir /efs/sec_efs 0775 radio system
@@ -328,38 +301,6 @@
chown system system /sys/class/sec/tsp/ta_mode
chown system system /sys/class/sec/tsp/virtual_prox
- # Permissions for Touchscreen-1
- chown system radio /sys/class/sec/tsp1/cmd
- chown system system /sys/class/sec/tsp1/input/enabled
- chmod 0660 /sys/class/sec/tsp/input1/enabled
- chown system system /sys/class/sec/tsp1/multi_count
- chown system system /sys/class/sec/tsp1/wet_mode
- chown system system /sys/class/sec/tsp1/noise_mode
- chown system system /sys/class/sec/tsp1/comm_err_count
- chown system system /sys/class/sec/tsp1/checksum
- chown system system /sys/class/sec/tsp1/all_touch_count
- chown system system /sys/class/sec/tsp1/z_value
- chown system system /sys/class/sec/tsp1/sensitivity_mode
- chown system system /sys/class/sec/tsp1/prox_power_off
- chown system system /sys/class/sec/tsp1/ic_reset_count
- chown system system /sys/class/sec/tsp1/mode_change_failed_count
-
- # Permissions for Touchscreen-2
- chown system radio /sys/class/sec/tsp2/cmd
- chown system system /sys/class/sec/tsp2/input/enabled
- chmod 0660 /sys/class/sec/tsp/input2/enabled
- chown system system /sys/class/sec/tsp2/multi_count
- chown system system /sys/class/sec/tsp2/wet_mode
- chown system system /sys/class/sec/tsp2/noise_mode
- chown system system /sys/class/sec/tsp2/comm_err_count
- chown system system /sys/class/sec/tsp2/checksum
- chown system system /sys/class/sec/tsp2/all_touch_count
- chown system system /sys/class/sec/tsp2/z_value
- chown system system /sys/class/sec/tsp2/sensitivity_mode
- chown system system /sys/class/sec/tsp2/prox_power_off
- chown system system /sys/class/sec/tsp2/ic_reset_count
- chown system system /sys/class/sec/tsp2/mode_change_failed_count
-
# Permissions for Wacom
chown system radio /sys/class/sec/sec_epen/cmd
chown system system /sys/class/sec/sec_epen/input/enabled
@@ -1042,17 +983,9 @@
chmod 0644 /sys/kernel/gpu/gpu_max_clock
chmod 0644 /sys/kernel/gpu/gpu_min_clock
-# LPM
-service lpm /system/bin/charger
+# Charger
+service charger /system/bin/charger
class sec-charger
user root
group system radio input
critical
-
-# CASS
-service cass /vendor/bin/cass
- class core
- user system
- group radio wakelock system
- capabilities BLOCK_SUSPEND
- disabled