X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Finitscripts;h=28387f3499a34e9aa2bf33a16d1890ac45ceb18d;hp=03cec8031cb64c15d2f19ff611d5795f6672d07c;hb=fd24071f657fff2dfa8f878b8eef5d6a1dcf20d8;hpb=e137ec4ecf166320ce92d5068e864034e19b8f48

diff --git a/lfs/initscripts b/lfs/initscripts
index 03cec8031..28387f349 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -157,6 +157,7 @@ $(TARGET) :
 	ln -sf ../init.d/leds        /etc/rc.d/rc6.d/K79leds
 	ln -sf ../init.d/fireinfo    /etc/rc.d/rc3.d/S15fireinfo
 	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
+	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S01sysctl
 	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/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
@@ -166,27 +167,27 @@ $(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/firewall    /etc/rc.d/rcsysinit.d/S85firewall
+	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/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 \
@@ -196,10 +197,13 @@ $(TARGET) :
 		ln -sf any /etc/rc.d/init.d/networking/$$i; \
 	done
 
-	# ARM does not need checkfstab
+	# ARM does not need checkfstab and acpid
 ifeq "$(MACHINE_TYPE)" "arm"
-	rm -vf /etc/rc.d/init.d/checkfstab
+	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