X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Finitscripts;h=6968edef452e42653606d716335cef5538427458;hb=c4d883f9e5c640512c680ed9c5e1e1e3441d8ec0;hp=c32b1693fcf8a6ac21dda4672a83f84eebfe02d5;hpb=4bdb372a5c31f8ed5b124176f9102ef69f33780f;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/initscripts b/lfs/initscripts
index c32b1693f..6968edef4 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -128,9 +128,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/beep        /etc/rc.d/rc0.d/K99beep
-	ln -sf ../init.d/beep        /etc/rc.d/rc3.d/S99beep
-	ln -sf ../init.d/beep        /etc/rc.d/rc6.d/K99beep
 	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
@@ -162,7 +159,6 @@ $(TARGET) :
 	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
-	ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
 	ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
 	ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
@@ -170,27 +166,29 @@ $(TARGET) :
 	ln -sf ../init.d/udev_retry  /etc/rc.d/rcsysinit.d/S45udev_retry
 	ln -sf ../init.d/cleanfs     /etc/rc.d/rcsysinit.d/S50cleanfs
 	ln -sf ../init.d/setclock    /etc/rc.d/rcsysinit.d/S60setclock
+	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/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
+	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/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 ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
-	ln -sf ../../../../../usr/local/bin/outgoingfwctrl \
-		/etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+	ln -sf ../../../../../usr/local/bin/firewallctrl \
+		/etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
 	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 ../../../../../usr/local/bin/setportfw \
-		/etc/rc.d/init.d/networking/red.up/25-portfw
-	ln -sf ../../../../../usr/local/bin/setxtaccess \
-		/etc/rc.d/init.d/networking/red.up/26-xtaccess
 	ln -sf ../../../../../usr/local/bin/dialctrl.pl \
 		/etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 	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
 	ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
 	ln -sf ../../../../../usr/local/bin/dialctrl.pl \
@@ -199,5 +197,15 @@ $(TARGET) :
 	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
+ifeq "$(MACHINE_TYPE)" "arm"
+	rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
+else
+	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)