omni: remove init.d support
if really needed we can bring it back
Change-Id: I2a88c1082869379da8e159cac06f6f2d4258cd86
diff --git a/config/common.mk b/config/common.mk
index 9e83d82..e45f96d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -40,15 +40,6 @@
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/sysconfig/backup.xml:system/etc/sysconfig/backup.xml
-# init.d support
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.d/00banner:system/etc/init.d/00banner \
- vendor/omni/prebuilt/bin/sysinit:system/bin/sysinit
-
-# userinit support
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.d/90userinit:system/etc/init.d/90userinit
-
# Init script file with omni extras
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/init.local.rc:root/init.omni.rc
diff --git a/prebuilt/bin/sysinit b/prebuilt/bin/sysinit
deleted file mode 100755
index 797a888..0000000
--- a/prebuilt/bin/sysinit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/system/bin/sh
-
-export PATH=/sbin:/system/sbin:/system/bin:/system/xbin
-/system/bin/logwrapper /system/xbin/run-parts /system/etc/init.d
diff --git a/prebuilt/etc/init.d/00banner b/prebuilt/etc/init.d/00banner
deleted file mode 100755
index e87f899..0000000
--- a/prebuilt/etc/init.d/00banner
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/system/bin/sh
-
-echo "==================================="
-echo " .----. .-. .-..-. .-..-."
-echo "/ {} \| \`.' || \`| || |"
-echo "\ /| |\ /| || |\ || |"
-echo " \`----' \`-' \` \`-'\`-' \`-'\`-'"
-echo "==================================="
diff --git a/prebuilt/etc/init.d/90userinit b/prebuilt/etc/init.d/90userinit
deleted file mode 100755
index e2b1643..0000000
--- a/prebuilt/etc/init.d/90userinit
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/system/bin/sh
-# call userinit.sh and/or userinit.d/* scripts if present in /data/local
-
-if [ -e /data/local/userinit.sh ];
-then
- log -p i -t userinit "Executing /data/local/userinit.sh";
- logwrapper /system/bin/sh /data/local/userinit.sh;
- setprop omni.userinit.active 1;
-fi;
-
-if [ -d /data/local/userinit.d ];
-then
- logwrapper busybox run-parts /data/local/userinit.d;
- setprop omni.userinit.active 1;
-fi;
diff --git a/prebuilt/etc/init.local.rc b/prebuilt/etc/init.local.rc
index 44c0dbd..0b4c7a3 100644
--- a/prebuilt/etc/init.local.rc
+++ b/prebuilt/etc/init.local.rc
@@ -43,15 +43,6 @@
chown system system /sys/module/lowmemorykiller/parameters/minfree
chmod 0644 /sys/module/lowmemorykiller/parameters/minfree
- # Run sysinit
- start sysinit
-
-# sysinit (/system/etc/init.d)
-service sysinit /system/bin/sysinit
- user root
- oneshot
- disabled
-
# adb over network
on property:service.adb.tcp.port=5555
stop adbd
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 34e8bc2..5e6018e 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -3,16 +3,7 @@
#
# performance-related sysfs files
-#/sys/kernel/mm/ksm(/.*)? u:object_r:sysfs_ksm:s0
/sys/block/zram(/.*)? u:object_r:sysfs_zram:s0
-#/sys/block/mmcblk([0-2])/queue/scheduler -- u:object_r:sysfs_ioscheduler:s0
-#/sys/block/mmcblk([0-2])/queue/read_ahead_kb -- u:object_r:sysfs_ioscheduler:s0
-#/sys/devices/.*/queue/scheduler -- u:object_r:sysfs_ioscheduler:s0
-#/sys/devices/.*/queue/read_ahead_kb -- u:object_r:sysfs_ioscheduler:s0
-
-/system/bin/sysinit u:object_r:sysinit_exec:s0
-/system/etc/init.d/90userinit u:object_r:userinit_exec:s0
-/data/local/userinit.sh u:object_r:userinit_data_exec:s0
# mkfs
/system/bin/mkfs\.exfat u:object_r:mkfs_exec:s0
diff --git a/sepolicy/sysinit.te b/sepolicy/sysinit.te
deleted file mode 100644
index e76bee6..0000000
--- a/sepolicy/sysinit.te
+++ /dev/null
@@ -1,16 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-type sysinit, domain;
-type sysinit_exec, exec_type, file_type;
-
-init_daemon_domain(sysinit)
-
-allow sysinit devpts:chr_file rw_file_perms;
-allow sysinit shell_exec:file rx_file_perms;
-allow sysinit system_file:file rx_file_perms;
-allow sysinit system_file:dir { read open };
-allow sysinit self:process { setcurrent setsched };
-allow sysinit userinit_exec:file { rx_file_perms };
-allow sysinit rootfs:lnk_file getattr;
diff --git a/sepolicy/userinit.te b/sepolicy/userinit.te
deleted file mode 100644
index a9b63a4..0000000
--- a/sepolicy/userinit.te
+++ /dev/null
@@ -1,8 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-type userinit_exec, exec_type, file_type;
-type userinit_data_exec, file_type;
-
-allow userinit_exec userinit_prop:property_service set;
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 8963237..4ccabe5 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -35,15 +35,6 @@
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/sysconfig/backup.xml:system/etc/sysconfig/backup.xml
-# init.d support
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.d/00banner:system/etc/init.d/00banner \
- vendor/omni/prebuilt/bin/sysinit:system/bin/sysinit
-
-# userinit support
-PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/init.d/90userinit:system/etc/init.d/90userinit
-
# Init script file with omni extras
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/init.local.rc:root/init.omni.rc