This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via d7501a96b72a4c0d2602230cf6cb7a17fa39b8fe (commit) via 6d36ee2a20f848478c40dc2279dc77ab3aa73865 (commit) from 84fc763fce865f66014f0d3dfd32c06f3a294d8a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d7501a96b72a4c0d2602230cf6cb7a17fa39b8fe Merge: 84fc763fce865f66014f0d3dfd32c06f3a294d8a 6d36ee2a20f848478c40dc2279dc77ab3aa73865 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 9 07:49:19 2010 +0200

Merge branch 'core37'

commit 6d36ee2a20f848478c40dc2279dc77ab3aa73865 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 9 07:47:28 2010 +0200

Fix rootfiles with /etc/init.d symlink problem.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/packages/amavisd | 2 +- config/rootfiles/packages/asterisk | 2 +- config/rootfiles/packages/fetchmail | 2 +- config/rootfiles/packages/gnump3d | 2 +- config/rootfiles/packages/hostapd | 2 +- config/rootfiles/packages/icecc | 2 +- config/rootfiles/packages/lcr | 2 +- config/rootfiles/packages/mldonkey | 2 +- config/rootfiles/packages/netsnmpd | 2 +- config/rootfiles/packages/nfs | 2 +- config/rootfiles/packages/portmap | 2 +- config/rootfiles/packages/spamassassin | 2 +- config/rootfiles/packages/teamspeak | 2 +- config/rootfiles/packages/tftpd | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)

Difference in files: diff --git a/config/rootfiles/packages/amavisd b/config/rootfiles/packages/amavisd index 3bed831..f2e1c3f 100644 --- a/config/rootfiles/packages/amavisd +++ b/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 diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index b1200d3..789ec1b 100644 --- a/config/rootfiles/packages/asterisk +++ b/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 diff --git a/config/rootfiles/packages/fetchmail b/config/rootfiles/packages/fetchmail index f78418a..c2b66c8 100644 --- a/config/rootfiles/packages/fetchmail +++ b/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 diff --git a/config/rootfiles/packages/gnump3d b/config/rootfiles/packages/gnump3d index 9352cf6..1f0a31e 100644 --- a/config/rootfiles/packages/gnump3d +++ b/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 diff --git a/config/rootfiles/packages/hostapd b/config/rootfiles/packages/hostapd index 5d09127..78c9c82 100644 --- a/config/rootfiles/packages/hostapd +++ b/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 diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc index bc9bfca..8e41873 100644 --- a/config/rootfiles/packages/icecc +++ b/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 diff --git a/config/rootfiles/packages/lcr b/config/rootfiles/packages/lcr index 1b47ae7..2633518 100644 --- a/config/rootfiles/packages/lcr +++ b/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 diff --git a/config/rootfiles/packages/mldonkey b/config/rootfiles/packages/mldonkey index b1fe6f7..1269488 100644 --- a/config/rootfiles/packages/mldonkey +++ b/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 diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 461c679..1d730cb 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/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 diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index a39e1f0..67bfa13 100644 --- a/config/rootfiles/packages/nfs +++ b/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 diff --git a/config/rootfiles/packages/portmap b/config/rootfiles/packages/portmap index 43db7f4..4b60d64 100644 --- a/config/rootfiles/packages/portmap +++ b/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 diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin index 20d3b7d..73b0066 100644 --- a/config/rootfiles/packages/spamassassin +++ b/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 diff --git a/config/rootfiles/packages/teamspeak b/config/rootfiles/packages/teamspeak index abeaf00..b7c2358 100644 --- a/config/rootfiles/packages/teamspeak +++ b/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 diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd index 5df1809..55d261b 100644 --- a/config/rootfiles/packages/tftpd +++ b/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

hooks/post-receive -- IPFire 2.x development tree