Merge branch 'core37'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Apr 2010 05:49:19 +0000 (07:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Apr 2010 05:49:19 +0000 (07:49 +0200)
14 files changed:
config/rootfiles/packages/amavisd
config/rootfiles/packages/asterisk
config/rootfiles/packages/fetchmail
config/rootfiles/packages/gnump3d
config/rootfiles/packages/hostapd
config/rootfiles/packages/icecc
config/rootfiles/packages/lcr
config/rootfiles/packages/mldonkey
config/rootfiles/packages/netsnmpd
config/rootfiles/packages/nfs
config/rootfiles/packages/portmap
config/rootfiles/packages/spamassassin
config/rootfiles/packages/teamspeak
config/rootfiles/packages/tftpd

index 3bed831..f2e1c3f 100644 (file)
@@ -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
index b1200d3..789ec1b 100644 (file)
@@ -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
index f78418a..c2b66c8 100644 (file)
@@ -1,4 +1,4 @@
-etc/init.d/fetchmail
+etc/rc.d/init.d/fetchmail
 root/.fetchmailrc
 usr/bin/fetchmail
 #usr/bin/fetchmailconf
index 9352cf6..1f0a31e 100644 (file)
@@ -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
index 5d09127..78c9c82 100644 (file)
@@ -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
index bc9bfca..8e41873 100644 (file)
@@ -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
index 1b47ae7..2633518 100644 (file)
@@ -1,4 +1,4 @@
-etc/init.d/lcr
+etc/rc.d/init.d/lcr
 usr/bin/gentones
 usr/bin/genwave
 usr/bin/lcradmin
index b1fe6f7..1269488 100644 (file)
@@ -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
index 461c679..1d730cb 100644 (file)
@@ -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
index a39e1f0..67bfa13 100644 (file)
@@ -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
index 43db7f4..4b60d64 100644 (file)
@@ -1,4 +1,4 @@
-etc/init.d/portmap
+etc/rc.d/init.d/portmap
 sbin/portmap
 #sbin/pmap_dump
 #sbin/pmap_set
index 20d3b7d..73b0066 100644 (file)
@@ -1,4 +1,4 @@
-etc/init.d/spamassassin
+etc/rc.d/init.d/spamassassin
 etc/mail
 #etc/mail/spamassassin
 #etc/mail/spamassassin/init.pre
index abeaf00..b7c2358 100644 (file)
@@ -1,3 +1,3 @@
-etc/init.d/teamspeak
+etc/rc.d/init.d/teamspeak
 opt/teamspeak
 var/ipfire/backup/addons/includes/teamspeak
index 5df1809..55d261b 100644 (file)
@@ -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