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 7210c0d2ea8e97a9dc216fb4372766c22d33fbb8..213b46e2724dc95c8deb9e2bfee85566b77f089a 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -166,6 +166,8 @@ $(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
@@ -197,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