Moved some initscripts to extras, where they belong.

Install them by macro.

diff --git a/lfs/dhcp b/lfs/dhcp
index 48fb76d16b1aaeb7e2a6c4c6061d18fb06adcf3d..b2d0cc633b48855068c98665bb316471dffbbb68 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -33,6 +33,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+INITSCRIPT = $(PKG_NAME)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -60,5 +62,8 @@ $(TARGET) :
        cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
        touch /var/state/dhcp/dhcpd.leases
        ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+
+       @$(INSTALL_INITSCRIPT)
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/openssh b/lfs/openssh
index b02ade5bb035aae272075a125987f2b696beaa87..aa6a1fb04078628f4ce3d5140d4fef86eb3f976d 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -33,6 +33,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+INITSCRIPT = sshd
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -67,5 +69,8 @@ $(TARGET) :
        cd $(DIR_APP) && make install
        sed 's@d/login@d/sshd@g' /etc/pam.d/login > /etc/pam.d/sshd
        chmod 644 /etc/pam.d/sshd
+
+       @$(INSTALL_INITSCRIPT)
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/core/dhcp b/src/initscripts/extras/dhcp
similarity index 100%
rename from src/initscripts/core/dhcp
rename to src/initscripts/extras/dhcp

diff --git a/src/initscripts/core/mISDN b/src/initscripts/extras/mISDN
similarity index 100%
rename from src/initscripts/core/mISDN
rename to src/initscripts/extras/mISDN

diff --git a/src/initscripts/core/sshd b/src/initscripts/extras/sshd
similarity index 100%
rename from src/initscripts/core/sshd
rename to src/initscripts/extras/sshd