diff --git a/config/common.mk b/config/common.mk index 2be6dfff..74e0afec 100644 --- a/config/common.mk +++ b/config/common.mk @@ -53,17 +53,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ vendor/lineage/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lineage-sysconfig.xml -# init.d support -PRODUCT_COPY_FILES += \ - vendor/lineage/prebuilt/common/etc/init.d/00banner:$(TARGET_COPY_OUT_SYSTEM)/etc/init.d/00banner \ - vendor/lineage/prebuilt/common/bin/sysinit:$(TARGET_COPY_OUT_SYSTEM)/bin/sysinit - -ifneq ($(TARGET_BUILD_VARIANT),user) -# userinit support -PRODUCT_COPY_FILES += \ - vendor/lineage/prebuilt/common/etc/init.d/90userinit:$(TARGET_COPY_OUT_SYSTEM)/etc/init.d/90userinit -endif - # Copy all Lineage-specific init rc files $(foreach f,$(wildcard vendor/lineage/prebuilt/common/etc/init/*.rc),\ $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_SYSTEM)/etc/init/$(notdir $f))) diff --git a/prebuilt/common/bin/sysinit b/prebuilt/common/bin/sysinit deleted file mode 100644 index 431afbc1..00000000 --- a/prebuilt/common/bin/sysinit +++ /dev/null @@ -1,9 +0,0 @@ -#!/system/bin/sh - -export PATH=/sbin:/system/sbin:/system/bin:/system/xbin -for i in /system/etc/init.d/*; do - if [ -x $i ]; then - /system/bin/log -t sysinit Running $i - $i - fi -done diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner deleted file mode 100644 index da6d487f..00000000 --- a/prebuilt/common/etc/init.d/00banner +++ /dev/null @@ -1,13 +0,0 @@ -#!/system/bin/sh -# -# Print startup info -# -L="log -p i -t lineage" - -$L "_ _ " -$L "| (_)_ __ ___ __ _ __ _ ___ ___ ___ " -$L "| | | '_ \\ / _ \\/ _\` |/ _\` |/ _ \\/ _ \\/ __|" -$L "| | | | | | __/ (_| | (_| | __/ (_) \\__ \\" -$L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/" -$L " |___/" -$L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.lineage.version`"; diff --git a/prebuilt/common/etc/init.d/90userinit b/prebuilt/common/etc/init.d/90userinit deleted file mode 100755 index fbf3360f..00000000 --- a/prebuilt/common/etc/init.d/90userinit +++ /dev/null @@ -1,9 +0,0 @@ -#!/system/bin/sh -# call userinit.sh if present in /data/local - -if [ -e /data/local/userinit.sh ]; -then - log -p i -t userinit "Executing /data/local/userinit.sh"; - /system/bin/sh /data/local/userinit.sh; - setprop lineage.userinit.active 1; -fi; diff --git a/prebuilt/common/etc/init/lineage-system.rc b/prebuilt/common/etc/init/lineage-system.rc index 619c6d82..396ec73a 100644 --- a/prebuilt/common/etc/init/lineage-system.rc +++ b/prebuilt/common/etc/init/lineage-system.rc @@ -6,9 +6,6 @@ on init on post-fs-data mkdir /cache/recovery 0770 system cache - # Run sysinit - start sysinit - # Change permissions on fsck log so it can be added to the dropbox chown root log /dev/fscklogs/log chmod 0640 /dev/fscklogs/log @@ -17,12 +14,6 @@ on boot # Persistent properties (only created if persist exists) mkdir /persist/properties 0770 system system -# sysinit (/system/etc/init.d) -service sysinit /system/bin/sysinit - user root - oneshot - 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