Merge branch 'core37'

config/rootfiles/packages/amavisd

@@ -1,5 +1,5 @@
 etc/amavisd.conf
-etc/init.d/amavisd
+etc/rc.d/init.d/amavisd
 usr/bin/amavisd
 var/amavis
 var/amavis/db

config/rootfiles/packages/asterisk

@@ -2517,6 +2517,6 @@ var/spool/asterisk/tmp
 var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/busy.gsm
 var/spool/asterisk/voicemail/default/1234/unavail.gsm
-etc/init.d/asterisk
+etc/rc.d/init.d/asterisk
 srv/web/ipfire/cgi-bin/asterisk
 var/ipfire/menu.d/EX-asterisk.menu

config/rootfiles/packages/fetchmail

@@ -1,4 +1,4 @@
-etc/init.d/fetchmail
+etc/rc.d/init.d/fetchmail
 root/.fetchmailrc
 usr/bin/fetchmail
 #usr/bin/fetchmailconf

config/rootfiles/packages/gnump3d

@@ -2,7 +2,7 @@
 etc/gnump3d/file.types
 etc/gnump3d/gnump3d.conf
 etc/gnump3d/mime.types
-etc/init.d/gnump3d
+etc/rc.d/init.d/gnump3d
 etc/fcron.daily/gnump3d-index
 usr/bin/gnump3d
 usr/bin/gnump3d-index

config/rootfiles/packages/hostapd

@@ -14,5 +14,5 @@ var/ipfire/wlanap/hostapd.deny
 var/ipfire/wlanap/settings
 srv/web/ipfire/cgi-bin/wlanap.cgi
 var/ipfire/menu.d/EX-wlanap.menu
-etc/init.d/hostapd
+etc/rc.d/init.d/hostapd
 usr/local/bin/wlanapctrl

config/rootfiles/packages/icecc

@@ -15,4 +15,4 @@
 #opt/icecream/sbin
 opt/icecream/sbin/icecc-scheduler
 opt/icecream/sbin/iceccd
-etc/init.d/icecream
+etc/rc.d/init.d/icecream

config/rootfiles/packages/lcr

@@ -1,4 +1,4 @@
-etc/init.d/lcr
+etc/rc.d/init.d/lcr
 usr/bin/gentones
 usr/bin/genwave
 usr/bin/lcradmin

config/rootfiles/packages/mldonkey

@@ -1,5 +1,5 @@
 var/ipfire/backup/addons/includes/mldonkey
-etc/init.d/mldonkey
+etc/rc.d/init.d/mldonkey
 #opt/mldonkey
 opt/mldonkey/.mldonkey
 #opt/mldonkey/.mldonkey/bittorrent.ini

config/rootfiles/packages/netsnmpd

@@ -586,4 +586,4 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging
 usr/share/snmp/snmpconf-data/snmptrapd-data/runtime
 usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
 usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle
-etc/init.d/netsnmpd
+etc/rc.d/init.d/netsnmpd

config/rootfiles/packages/nfs

@@ -1,4 +1,4 @@
-etc/init.d/nfs-server
+etc/rc.d/init.d/nfs-server
 #usr/man/man5/exports.5
 #usr/man/man7/nfsd.7
 #usr/man/man8/exportfs.8

config/rootfiles/packages/portmap

@@ -1,4 +1,4 @@
-etc/init.d/portmap
+etc/rc.d/init.d/portmap
 sbin/portmap
 #sbin/pmap_dump
 #sbin/pmap_set

config/rootfiles/packages/spamassassin

@@ -1,4 +1,4 @@
-etc/init.d/spamassassin
+etc/rc.d/init.d/spamassassin
 etc/mail
 #etc/mail/spamassassin
 #etc/mail/spamassassin/init.pre

config/rootfiles/packages/teamspeak

@@ -1,3 +1,3 @@
-etc/init.d/teamspeak
+etc/rc.d/init.d/teamspeak
 opt/teamspeak
 var/ipfire/backup/addons/includes/teamspeak

config/rootfiles/packages/tftpd

@@ -1,4 +1,4 @@
-etc/init.d/tftpd
+etc/rc.d/init.d/tftpd
 #usr/man/man1/tftp.1
 #usr/man/man8/in.tftpd.8
 #usr/man/man8/tftpd.8