Moved some initscripts to where they belong.

diff --git a/lfs/dbus b/lfs/dbus
index b9509555ab6101bc6425ecf86fa159f124b87ec5..20d52fa5566b6a21b011dce1a1cbe9bd8639fc86 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -51,6 +51,8 @@ define LONG_DESC
        per-user-login-session messaging facility.
 endef
 
+INITSCRIPT = messagebus
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -88,5 +90,6 @@ $(OBJECT): $(objects)
 
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/fcron b/lfs/fcron
index 5db0b8349cf8c41ac29bcc3afdc3cefb6f89a418..cc8f8626e3cccd3513e3f735335df2e4416fc7dd 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -98,5 +98,6 @@ $(OBJECT): $(objects)
 
        fcrontab $(DIR_CONFIG)/$(PKG_NAME)/crontab
 
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/firewall b/lfs/firewall
index c4b7cf37888452a64c1317aeaea770ce0a42246e..219730133937c50f62d77788ed3d4255b558ebab 100644 (file)
--- a/lfs/firewall
+++ b/lfs/firewall
@@ -79,4 +79,5 @@ $(OBJECT): $(objects)
        done
        cp -avf $(DIR_APP)/macros /usr/share/firewall/
        install -m 755 -v $(DIR_APP)/firewall /usr/bin
+       $(INSTALL_INITSCRIPT)
        @$(POSTBUILD)

diff --git a/lfs/hal b/lfs/hal
index f1fb736bdb39a3fe4749043c1b8180bb91ade265..ff0ead3bb5aba0c32dc64272d3b97cf3ffbb10d7 100644 (file)
--- a/lfs/hal
+++ b/lfs/hal
@@ -50,6 +50,8 @@ define LONG_DESC
        sources about the hardware on the system.
 endef
 
+INITSCRIPT = haldaemon
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -88,5 +90,6 @@ $(OBJECT): $(objects)
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        -mv -v /etc/udev/rules.d/90-hal.rules /lib/udev/rules.d/
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/lighttpd b/lfs/lighttpd
index 6b200155a62fb21953c874734a13feee6c5fbc7e..edab857d544487666e34d4fd8053603038210aa9 100644 (file)
--- a/lfs/lighttpd
+++ b/lfs/lighttpd
@@ -96,5 +96,6 @@ $(OBJECT): $(objects)
        touch /var/log/$(PKG_NAME)/{access,error}.log
        chown nobody.nobody -R /var/log/$(PKG_NAME)
 
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/network b/lfs/network
index bb2b2ad83c3a96e238f3ee5f9fd2aead795ab9e0..0fc34d834b825db60be1831f7926d248133fec9f 100644 (file)
--- a/lfs/network
+++ b/lfs/network
@@ -74,4 +74,5 @@ $(objects):
 $(OBJECT): $(objects)
        @$(PREBUILD)
        install -m 755 -v $(DIR_APP)/network /usr/bin
+       $(INSTALL_INITSCRIPT)
        @$(POSTBUILD)

diff --git a/lfs/openldap b/lfs/openldap
index afe98de5263523f403032317c2bd20a2af590a2f..14c1f155efcf6a5d08745932717565e7a1b8d54c 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -93,5 +93,6 @@ $(OBJECT): $(objects)
        for LINK in lber ldap ldap_r; do \
                chmod -v 0755 /usr/lib/$$(readlink /usr/lib/lib$${LINK}.so); \
        done
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/syslog-ng b/lfs/syslog-ng
index 70bf57683f9c8b637d8c40e18e6acdc4dcc508d0..7d8eaa9b34e62248104ca00f5577fd307c7b2a93 100644 (file)
--- a/lfs/syslog-ng
+++ b/lfs/syslog-ng
@@ -101,5 +101,6 @@ $(OBJECT): $(objects)
        install -v -m 755 $(DIR_CONF)/$(PKG_NAME)/ids-block \
                /usr/sbin/ids-block
 
+       $(INSTALL_INITSCRIPT)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

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

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

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

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

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

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

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

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