X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitscripts;h=6239d51a5d8dbe086c388f2f9401297e9f45c34a;hp=44ce96a1a1688c39ebb74f0118230911d5752857;hb=535628499c29897f4324ad033d357901f6f4101c;hpb=231048413ceb290dacedb62a38063e7079d9ef56

diff --git a/lfs/initscripts b/lfs/initscripts
index 44ce96a1a1..6239d51a5d 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -50,35 +50,53 @@ md5 :
 
 $(TARGET) :
 	@$(PREBUILD)
-
-	# Make directories
 	install -d -m 755 /etc/rc.d/rc0.d
-	install -d -m 755 /etc/rc.d/rc1.d
-	install -d -m 755 /etc/rc.d/rc2.d
 	install -d -m 755 /etc/rc.d/rc3.d
-	install -d -m 755 /etc/rc.d/rc4.d
-	install -d -m 755 /etc/rc.d/rc5.d
 	install -d -m 755 /etc/rc.d/rc6.d
 	install -d -m 755 /etc/rc.d/rcsysinit.d
 	install -d -m 755 /etc/rc.d/init.d
+	install -d -m 755 /etc/rc.d/init.d/net
+	install -d -m 755 /etc/rc.d/init.d/net/common
+	install -d -m 755 /etc/rc.d/init.d/net/red
+	install -d -m 755 /etc/rc.d/helper
 	install -d -m 755 /etc/sysconfig
+	-rm -rf /etc/init.d
+	ln -svf rc.d/init.d /etc/init.d
 
 	for i in $(DIR_SRC)/src/initscripts/init.d/*; 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/net/*; do \
+		if [ -f $$i ]; then \
+			install -v -m 754 $$i /etc/rc.d/init.d/net/; \
+		fi; \
+	done
+
+	for i in $(DIR_SRC)/src/initscripts/init.d/net/common/*; do \
+		install -v -m 754 $$i /etc/rc.d/init.d/net/common/; \
+	done
+
+	for i in $(DIR_SRC)/src/initscripts/init.d/net/red/*; do \
+		install -v -m 754 $$i /etc/rc.d/init.d/net/red/; \
+	done
+
+	for i in $(DIR_SRC)/src/initscripts/sysconfig/*; do \
+		install -v -m 644 $$i /etc/sysconfig/; \
+	done
+
+	for i in $(DIR_SRC)/src/initscripts/helper/*; do \
+		install -v -m 755 $$i /etc/rc.d/helper/; \
+	done
+
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals
-	ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S70mountfs
-	ln -sf ../init.d/swap        /etc/rc.d/rc0.d/S80swap
-	ln -sf ../init.d/localnet    /etc/rc.d/rc0.d/S90localnet
+	ln -sf ../init.d/localnet    /etc/rc.d/rc0.d/S70localnet
+	ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S80mountfs
+	ln -sf ../init.d/swap        /etc/rc.d/rc0.d/S90swap
 	ln -sf ../init.d/halt        /etc/rc.d/rc0.d/S99halt
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc1.d/K90sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc2.d/K90sysklogd
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc3.d/S10sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc4.d/S10sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc5.d/S10sysklogd
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc6.d/K90sysklogd
 	ln -sf ../init.d/sendsignals /etc/rc.d/rc6.d/S60sendsignals
 	ln -sf ../init.d/mountfs     /etc/rc.d/rc6.d/S70mountfs
@@ -86,26 +104,21 @@ $(TARGET) :
 	ln -sf ../init.d/localnet    /etc/rc.d/rc6.d/S90localnet
 	ln -sf ../init.d/reboot      /etc/rc.d/rc6.d/S99reboot
 	ln -sf ../init.d/sshd        /etc/rc.d/rc0.d/K30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc1.d/K30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc2.d/K30sshd
 	ln -sf ../init.d/sshd        /etc/rc.d/rc3.d/S30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc4.d/S30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc5.d/S30sshd
 	ln -sf ../init.d/sshd        /etc/rc.d/rc6.d/K30sshd
 	ln -sf ../init.d/apache      /etc/rc.d/rc0.d/K28apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc1.d/K28apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc2.d/K28apache
 	ln -sf ../init.d/apache      /etc/rc.d/rc3.d/S32apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc4.d/S32apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc5.d/S32apache
 	ln -sf ../init.d/apache      /etc/rc.d/rc6.d/K28apache
 	ln -sf ../init.d/fcron       /etc/rc.d/rc0.d/K08fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc1.d/K08fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc2.d/S40fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc3.d/S40fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc4.d/S40fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc5.d/S40fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc6.d/K08fcron
+	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/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 ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
@@ -119,25 +132,6 @@ $(TARGET) :
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
 
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/createfiles /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/modules     /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/rc          /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/clock       /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/network     /etc/sysconfig/
-
-#	-mkdir -p /etc/rc.d/helper
-#	for i in $(DIR_SRC)/src/rc.d/* ; do \
-#	    if [ -f $$i ]; then \
-#	        sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/`basename $$i`; \
-#	    fi; \
-#	done
-#	for i in $(DIR_SRC)/src/rc.d/helper/* ; do \
-#	    if [ -f $$i ]; then \
-#	        sed "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i > /etc/rc.d/helper/`basename $$i`; \
-#	    fi; \
-#	done
-#	chmod -R 755 /etc/rc.d
-#	chgrp nobody /etc/rc.d/rc.red
-#	chmod 4750 /etc/rc.d/rc.red
-
+	chgrp nobody /etc/rc.d/init.d/red
+	chmod 4750 /etc/rc.d/init.d/red
 	@$(POSTBUILD)