From 1f0d9c13417ad7ffad7295e61bd20b04b36a24cd Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 14 Nov 2021 18:10:56 +0200
Subject: [PATCH] Reorganize init scripts

* Add init prefix
* Improve naming
* Move to system_ext

Change-Id: Ic6cc600feca48e9f9b83e023a16daed25b5a7de8
---
 config/common.mk                                     | 12 +++++++++---
 .../{lineage-system.rc => init.lineage-system.rc}    |  0
 .../{lineage-updates.rc => init.lineage-updater.rc}  |  0
 .../etc/init/{lineage-ssh.rc => init.openssh.rc}     |  0
 4 files changed, 9 insertions(+), 3 deletions(-)
 rename prebuilt/common/etc/init/{lineage-system.rc => init.lineage-system.rc} (100%)
 rename prebuilt/common/etc/init/{lineage-updates.rc => init.lineage-updater.rc} (100%)
 rename prebuilt/common/etc/init/{lineage-ssh.rc => init.openssh.rc} (100%)

diff --git a/config/common.mk b/config/common.mk
index f825c1ab..22ce832a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -49,9 +49,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/lineage/config/permissions/lineage-sysconfig.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lineage-sysconfig.xml
 
-# 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)))
+# Lineage-specific init rc file
+PRODUCT_COPY_FILES += \
+    vendor/lineage/prebuilt/common/etc/init/init.lineage-system.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.lineage-system.rc
 
 # Enable Android Beam on all targets
 PRODUCT_COPY_FILES += \
@@ -108,6 +108,9 @@ PRODUCT_PACKAGES += \
     LineageSetupWizard \
     Updater
 
+PRODUCT_COPY_FILES += \
+    vendor/lineage/prebuilt/common/etc/init/init.lineage-updater.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.lineage-updater.rc
+
 # Themes
 PRODUCT_PACKAGES += \
     LineageThemesStub \
@@ -143,6 +146,9 @@ PRODUCT_PACKAGES += \
     ssh-keygen \
     start-ssh
 
+PRODUCT_COPY_FILES += \
+    vendor/lineage/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
+
 # rsync
 PRODUCT_PACKAGES += \
     rsync
diff --git a/prebuilt/common/etc/init/lineage-system.rc b/prebuilt/common/etc/init/init.lineage-system.rc
similarity index 100%
rename from prebuilt/common/etc/init/lineage-system.rc
rename to prebuilt/common/etc/init/init.lineage-system.rc
diff --git a/prebuilt/common/etc/init/lineage-updates.rc b/prebuilt/common/etc/init/init.lineage-updater.rc
similarity index 100%
rename from prebuilt/common/etc/init/lineage-updates.rc
rename to prebuilt/common/etc/init/init.lineage-updater.rc
diff --git a/prebuilt/common/etc/init/lineage-ssh.rc b/prebuilt/common/etc/init/init.openssh.rc
similarity index 100%
rename from prebuilt/common/etc/init/lineage-ssh.rc
rename to prebuilt/common/etc/init/init.openssh.rc