X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitscripts;h=0d7f40cadb8951c47ee6b18615ed4d7ac145d79f;hb=d4aea34da822ba5856d4fe2ef0164107fb6ed60d;hp=4369ffe413755baeb3979955b89e61e59228ecaa;hpb=f5275b5930016b466e136dd6fb8ce535be618c4a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/initscripts b/lfs/initscripts
index 4369ffe413..0d7f40cadb 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -64,22 +64,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
 
@@ -128,15 +128,12 @@ $(TARGET) :
 	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/S21unbound
+	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/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
@@ -178,6 +175,7 @@ $(TARGET) :
 	ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
 	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/pakfire     /etc/rc.d/rcsysinit.d/S81pakfire
 	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
@@ -198,15 +196,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)