Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files

diff --combined config/rootfiles/common/initscripts
index 5fd0c17d964d28d49af21aa7c3f9295d5c634584,0a99dc97a9ca97d533b626c30f4b1785ddd76075..3aa0d22c4922c7d5082ad5116521c38e5e2cabb1
--- 1/config/rootfiles/common/initscripts
--- 2/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@@ -1,4 -1,3 +1,3 @@@
- etc/init.d
  #etc/rc.d
  #etc/rc.d/helper
  etc/rc.d/helper/getdnsfromdhcpc.pl
@@@ -28,7 -27,6 +27,7 @@@ etc/rc.d/init.d/dnsmas
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
  etc/rc.d/init.d/firewall
 +etc/rc.d/init.d/firstsetup
  etc/rc.d/init.d/functions
  #etc/rc.d/init.d/gnump3d
  etc/rc.d/init.d/halt
@@@ -41,15 -39,19 +40,19 @@@ etc/rc.d/init.d/ipse
  #etc/rc.d/init.d/lcr
  etc/rc.d/init.d/leds
  etc/rc.d/init.d/localnet
+ etc/rc.d/init.d/mISDN
+ #etc/rc.d/init.d/mdadm
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
+ #etc/rc.d/init.d/miau
  #etc/rc.d/init.d/mldonkey
- etc/rc.d/init.d/mISDN
  etc/rc.d/init.d/modules
+ #etc/rc.d/init.d/motion
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
+ #etc/rc.d/init.d/netsnmpd
  etc/rc.d/init.d/network
  #etc/rc.d/init.d/networking
  etc/rc.d/init.d/networking/any
@@@ -80,10 -82,10 +83,10 @@@ etc/rc.d/init.d/networking/red.up/50-ip
  etc/rc.d/init.d/networking/red.up/50-ovpn
  etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
  etc/rc.d/init.d/networking/red.up/99-pakfire-update
- #etc/rc.d/init.d/openvmtools
  #etc/rc.d/init.d/nfs-server
  etc/rc.d/init.d/ntp
  #etc/rc.d/init.d/nut
+ #etc/rc.d/init.d/openvmtools
  #etc/rc.d/init.d/portmap
  #etc/rc.d/init.d/postfix
  #etc/rc.d/init.d/pound
@@@ -106,26 -108,33 +109,33 @@@ etc/rc.d/init.d/sysklog
  etc/rc.d/init.d/teamspeak
  etc/rc.d/init.d/template
  #etc/rc.d/init.d/tftpd
+ etc/rc.d/init.d/tmpfs
  etc/rc.d/init.d/udev
  etc/rc.d/init.d/udev_retry
  etc/rc.d/init.d/upnpd
  #etc/rc.d/init.d/vdr
+ #etc/rc.d/init.d/vdradmin
  #etc/rc.d/init.d/vsftpd
  #etc/rc.d/init.d/watchdog
  #etc/rc.d/init.d/winbind
  #etc/rc.d/init.d/xinetd
  #etc/rc.d/rc0.d
+ #etc/rc.d/rc0.d/K01imspetor
+ #etc/rc.d/rc0.d/K01motion
+ #etc/rc.d/rc0.d/K01vdradmin
  #etc/rc.d/rc0.d/K02mediatomb
  #etc/rc.d/rc0.d/K02sslh
  etc/rc.d/rc0.d/K08fcron
  etc/rc.d/rc0.d/K28apache
  etc/rc.d/rc0.d/K30sshd
  etc/rc.d/rc0.d/K45random
+ etc/rc.d/rc0.d/K49cyrus-sasl
  etc/rc.d/rc0.d/K78snort
  etc/rc.d/rc0.d/K79leds
  etc/rc.d/rc0.d/K80network
  #etc/rc.d/rc0.d/K84bluetooth
  #etc/rc.d/rc0.d/K85messagebus
+ etc/rc.d/rc0.d/K85tmpfs
  etc/rc.d/rc0.d/K90sysklogd
  etc/rc.d/rc0.d/K99beep
  etc/rc.d/rc0.d/S60sendsignals
@@@ -134,6 -143,7 +144,7 @@@ etc/rc.d/rc0.d/S80mountf
  etc/rc.d/rc0.d/S90swap
  etc/rc.d/rc0.d/S99halt
  #etc/rc.d/rc3.d
+ etc/rc.d/rc3.d/S01tmpfs
  etc/rc.d/rc3.d/S10sysklogd
  #etc/rc.d/rc3.d/S15messagebus
  #etc/rc.d/rc3.d/S16bluetooth
@@@ -141,6 -151,7 +152,7 @@@
  etc/rc.d/rc3.d/S19smartenabler
  etc/rc.d/rc3.d/S20network
  etc/rc.d/rc3.d/S21leds
+ etc/rc.d/rc3.d/S24cyrus-sasl
  etc/rc.d/rc3.d/S25random
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
@@@ -149,18 -160,26 +161,26 @@@ etc/rc.d/rc3.d/S40fcro
  etc/rc.d/rc3.d/S98rc.local
  #etc/rc.d/rc3.d/S98sslh
  etc/rc.d/rc3.d/S99beep
+ #etc/rc.d/rc3.d/S99imspetor
+ #etc/rc.d/rc3.d/S99motion
+ #etc/rc.d/rc3.d/S99vdradmin
  #etc/rc.d/rc6.d
+ #etc/rc.d/rc6.d/K01imspetor
+ #etc/rc.d/rc6.d/K01motion
+ #etc/rc.d/rc6.d/K01vdradmin
  #etc/rc.d/rc6.d/K02mediatomb
  #etc/rc.d/rc6.d/K02sslh
  etc/rc.d/rc6.d/K08fcron
  etc/rc.d/rc6.d/K28apache
  etc/rc.d/rc6.d/K30sshd
  etc/rc.d/rc6.d/K45random
+ etc/rc.d/rc6.d/K49cyrus-sasl
  etc/rc.d/rc6.d/K78snort
  etc/rc.d/rc6.d/K79leds
  etc/rc.d/rc6.d/K80network
  #etc/rc.d/rc6.d/K84bluetooth
  #etc/rc.d/rc6.d/K85messagebus
+ etc/rc.d/rc6.d/K85tmpfs
  etc/rc.d/rc6.d/K90sysklogd
  etc/rc.d/rc6.d/K99beep
  etc/rc.d/rc6.d/S60sendsignals
@@@ -180,7 -199,6 +200,7 @@@ etc/rc.d/rcsysinit.d/S45udev_retr
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
 +etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S90sysctl
  #etc/sysconfig
@@@ -189,24 -207,4 +209,4 @@@ etc/sysconfig/firewall.loca
  etc/sysconfig/modules
  etc/sysconfig/rc
  etc/sysconfig/rc.local
- etc/rc.d/init.d/tmpfs
- etc/rc.d/rc0.d/K85tmpfs
- etc/rc.d/rc3.d/S01tmpfs
- etc/rc.d/rc6.d/K85tmpfs
- #etc/rc.d/init.d/vdradmin
- #etc/rc.d/rc0.d/K01vdradmin
- #etc/rc.d/rc3.d/S99vdradmin
- #etc/rc.d/rc6.d/K01vdradmin
- #etc/rc.d/init.d/motion
- #etc/rc.d/rc0.d/K01motion
- #etc/rc.d/rc3.d/S99motion
- #etc/rc.d/rc6.d/K01motion
- #etc/rc.d/init.d/miau
- #etc/rc.d/rc0.d/K01miau
- #etc/rc.d/rc3.d/S99miau
- #etc/rc.d/rc6.d/K01miau
- #etc/rc.d/init.d/netsnmpd
- #etc/rc.d/init.d/mdadm
- etc/rc.d/rc0.d/K49cyrus-sasl
- etc/rc.d/rc3.d/S24cyrus-sasl
- etc/rc.d/rc6.d/K49cyrus-sasl
+ etc/init.d