X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitscripts;h=c053b711511671014aead24bbb13fc2b0edbda51;hp=c5baf680a7c1b69af867fb053d737f3f982c18f0;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=693928d781bee3151d5108a6f68a464202e78eeb

diff --git a/lfs/initscripts b/lfs/initscripts
index c5baf680a7..c053b71151 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License           #
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
-###############################################################################
 
 ###############################################################################
 # Definitions
@@ -64,22 +63,22 @@ $(TARGET) :
 	# Create default ramdisk configuration
 	echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
 
-	for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
+	for i in $(DIR_SRC)/src/initscripts/system/*; do \
 		install -v -m 754 $$i /etc/rc.d/init.d/; \
 	done
 	chmod 644 /etc/rc.d/init.d/functions
 
-	for i in $(DIR_SRC)/src/initscripts/init.d/networking/*; do \
+	for i in $(DIR_SRC)/src/initscripts/networking/*; do \
 		if [ -f $$i ]; then \
 			install -v -m 754 $$i /etc/rc.d/init.d/networking/; \
 		fi; \
 	done
 
-	for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.up/*; do \
+	for i in $(DIR_SRC)/src/initscripts/networking/red.up/*; do \
 		install -v -m 754 $$i /etc/rc.d/init.d/networking/red.up/; \
 	done
 
-	for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.down/*; do \
+	for i in $(DIR_SRC)/src/initscripts/networking/red.down/*; do \
 		install -v -m 754 $$i /etc/rc.d/init.d/networking/red.down/; \
 	done
 
@@ -131,12 +130,9 @@ $(TARGET) :
 	ln -sf ../init.d/unbound     /etc/rc.d/rc3.d/S11unbound
 	ln -sf ../init.d/unbound     /etc/rc.d/rc6.d/K79unbound
 	ln -sf ../init.d/random      /etc/rc.d/rc0.d/K45random
-	ln -sf ../init.d/random      /etc/rc.d/rc3.d/S25random
+	ln -sf ../init.d/random      /etc/rc.d/rc3.d/S00random
 	ln -sf ../init.d/random      /etc/rc.d/rc6.d/K45random
 	ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
-	ln -sf ../init.d/mediatomb   /etc/rc.d/rc3.d/S98mediatomb
-	ln -sf ../init.d/mediatomb   /etc/rc.d/rc0.d/K02mediatomb
-	ln -sf ../init.d/mediatomb   /etc/rc.d/rc6.d/K02mediatomb
 	ln -sf ../init.d/client175   /etc/rc.d/rc0.d/K34client175
 	ln -sf ../init.d/client175   /etc/rc.d/rc3.d/S66client175
 	ln -sf ../init.d/client175   /etc/rc.d/rc6.d/K34client175
@@ -159,6 +155,9 @@ $(TARGET) :
 	ln -sf ../init.d/leds        /etc/rc.d/rc3.d/S21leds
 	ln -sf ../init.d/leds        /etc/rc.d/rc6.d/K79leds
 	ln -sf ../init.d/fireinfo    /etc/rc.d/rc3.d/S15fireinfo
+	ln -sf ../init.d/conntrackd  /etc/rc.d/rc0.d/K77conntrackd
+	ln -sf ../init.d/conntrackd  /etc/rc.d/rc3.d/S22conntrackd
+	ln -sf ../init.d/conntrackd  /etc/rc.d/rc6.d/K77conntrackd
 	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S01sysctl
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
@@ -176,10 +175,11 @@ $(TARGET) :
 	ln -sf ../init.d/setclock    /etc/rc.d/rc0.d/K47setclock
 	ln -sf ../init.d/setclock    /etc/rc.d/rc6.d/K47setclock
 	ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
+	ln -sf ../init.d/pakfire     /etc/rc.d/rcsysinit.d/S71pakfire
+	ln -sf ../init.d/aws         /etc/rc.d/rcsysinit.d/S74aws
 	ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/firewall    /etc/rc.d/rcsysinit.d/S85firewall
-	ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger
 	ln -sf ../init.d/rngd        /etc/rc.d/rcsysinit.d/S92rngd
 	ln -sf ../init.d/vnstat      /etc/rc.d/rc3.d/S01vnstat
 	ln -sf ../init.d/vnstat      /etc/rc.d/rc0.d/K51vnstat
@@ -198,15 +198,13 @@ $(TARGET) :
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done
 
-	# ARM does not need acpid, intel no swconfig
-ifeq "$(MACHINE_TYPE)" "arm"
-	rm -vf /etc/rc.d/init.d/acpid
+	# intel intel no swconfig
+ifeq "$(BUILD_PLATFORM)" "arm"
 	ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
 else
 	rm -vf /etc/rc.d/init.d/swconfig
+endif
 	ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
 	ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
-endif
-
 	@$(POSTBUILD)