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 2789f3574dd4f66749b9fae6e84224ccee1c1d52 (commit) from d25238aadf23d9c21ac3c2ad192af2925114b6bb (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 2789f3574dd4f66749b9fae6e84224ccee1c1d52 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jul 9 00:34:11 2010 +0200

Remove empty nameserver entry from resolv.conf.

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

Summary of changes: config/rootfiles/core/39/filelists/files | 1 + src/initscripts/init.d/dnsmasq | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index f1526f0..5b9c934 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/networking/red etc/rc.d/helper/getdnsfromdhcpc.pl srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index eaa55ce..0dfb1f4 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -28,11 +28,15 @@ case "${1}" in echo > /var/ipfire/red/resolv.conf # Clear it if [ -e "/var/ipfire/red/dns1" ]; then DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null) - echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf + if [ ! -z ${DNS1} ]; then + echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf + fi fi if [ -e "/var/ipfire/red/dns2" ]; then DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null) - echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf + if [ ! -z ${DNS2} ]; then + echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf + fi fi [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"

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