X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitscripts;h=9d3a52c77008fd910d5f3ab1d64a2e25d87ac7a5;hb=fbcb5b749a6e373ca86271232960e4a46b857761;hp=400594136230363a5ea32c29bab06658cffbe7bb;hpb=188c4ba444b31343c29b311fcb2d0c0ba84e80ee;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/initscripts b/lfs/initscripts
old mode 100755
new mode 100644
index 4005941362..9d3a52c770
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2016  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        #
@@ -61,22 +61,25 @@ $(TARGET) :
 	-rm -rf /etc/init.d
 	ln -svf rc.d/init.d /etc/init.d
 
-	for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
+	# Create default ramdisk configuration
+	echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
+
+	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
 
@@ -124,16 +127,13 @@ $(TARGET) :
 	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
+	ln -sf ../init.d/unbound     /etc/rc.d/rc0.d/K79unbound
+	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/rc6.d/K45random
 	ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
-	ln -sf ../init.d/tmpfs       /etc/rc.d/rc0.d/K85tmpfs
-	ln -sf ../init.d/tmpfs       /etc/rc.d/rc3.d/S01tmpfs
-	ln -sf ../init.d/tmpfs       /etc/rc.d/rc6.d/K85tmpfs
-	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
@@ -177,34 +177,33 @@ $(TARGET) :
 	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/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans
 	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
+	ln -sf ../init.d/vnstat      /etc/rc.d/rc6.d/K51vnstat
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc0.d/K82wlanclient
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc3.d/S19wlanclient
 	ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
 
-	ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 	ln -sf ../../../../../usr/local/bin/snortctrl \
 		/etc/rc.d/init.d/networking/red.up/23-RS-snort
 	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
-	ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
 
 	for i in green blue orange; do \
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done
 
-	# ARM does not need checkfstab and acpid, intel no swconfig
-ifeq "$(MACHINE_TYPE)" "arm"
-	rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
+	# ARM does not need acpid, 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
 	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
-	ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
 endif
 
 	@$(POSTBUILD)