Merge remote-tracking branch 'stevee/mc-update' into thirteen

[people/pmueller/ipfire-2.x.git] / lfs / initscripts

diff --git a/lfs/initscripts b/lfs/initscripts
index b15ef3c4d50abc92cb7942e4836163e6fb39af0f..213b46e2724dc95c8deb9e2bfee85566b77f089a 100644 (file)
--- 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
@@ -169,10 +166,13 @@ $(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 ../../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
@@ -199,10 +199,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