From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 May 2009 07:45:59 +0000 (+0200)
Subject: Moved some initscripts to where they belong.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f66b7238d07d6d8eece5a820c752ef63b97d36b;p=ipfire-3.x.git

Moved some initscripts to where they belong.
---

diff --git a/lfs/dbus b/lfs/dbus
index b9509555a..20d52fa55 100644
--- 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 5db0b8349..cc8f8626e 100644
--- 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 c4b7cf378..219730133 100644
--- 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 f1fb736bd..ff0ead3bb 100644
--- 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 6b200155a..edab857d5 100644
--- 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 bb2b2ad83..0fc34d834 100644
--- 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 afe98de52..14c1f155e 100644
--- 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 70bf57683..7d8eaa9b3 100644
--- 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