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

diff --git a/lfs/initscripts b/lfs/initscripts
index c5baf680a7..9d3a52c770 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
 
@@ -134,9 +134,6 @@ $(TARGET) :
 	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
@@ -199,7 +196,7 @@ $(TARGET) :
 	done
 
 	# ARM does not need acpid, intel no swconfig
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	rm -vf /etc/rc.d/init.d/acpid
 	ln -sf ../init.d/swconfig    /etc/rc.d/rcsysinit.d/S73swconfig
 else