X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitscripts;h=682bfc0fe93ca1659b30adeab2d1948b6693494d;hb=a13ddf04d9b58ee469b5da6bc0dd5efb64d6ebad;hp=7d07b8ab3934c7cfe65bad1dc580e92e44b72e63;hpb=01d89a24d3701e2aa79b0681a20ee64de3c899c4;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/initscripts b/lfs/initscripts
index 7d07b8ab39..682bfc0fe9 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
@@ -122,8 +121,8 @@ $(TARGET) :
 	ln -sf ../init.d/fcron       /etc/rc.d/rc0.d/K08fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc3.d/S40fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc6.d/K08fcron
-	ln -sf ../init.d/snort       /etc/rc.d/rc0.d/K78snort
-	ln -sf ../init.d/snort       /etc/rc.d/rc6.d/K78snort
+	ln -sf ../init.d/suricata    /etc/rc.d/rc0.d/K78suricata
+	ln -sf ../init.d/suricata    /etc/rc.d/rc6.d/K78suricata
 	ln -sf ../init.d/network     /etc/rc.d/rc0.d/K80network
 	ln -sf ../init.d/network     /etc/rc.d/rc3.d/S20network
 	ln -sf ../init.d/network     /etc/rc.d/rc6.d/K80network
@@ -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
@@ -176,10 +172,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
@@ -188,8 +185,8 @@ $(TARGET) :
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc3.d/S19wlanclient
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
 
-	ln -sf ../../../../../usr/local/bin/snortctrl \
-		/etc/rc.d/init.d/networking/red.up/23-RS-snort
+	ln -sf ../../../../../usr/local/bin/suricatactrl \
+		/etc/rc.d/init.d/networking/red.up/23-RS-suricata
 	ln -sf ../../../../../usr/local/bin/qosctrl \
 		/etc/rc.d/init.d/networking/red.up/24-RS-qos
 	ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
@@ -198,15 +195,13 @@ $(TARGET) :
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done
 
-	# ARM does not need acpid, intel no swconfig
+	# intel intel no swconfig
 ifeq "$(BUILD_PLATFORM)" "arm"
-	rm -vf /etc/rc.d/init.d/acpid
 	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)