Remove empty nameserver entry from resolv.conf.

This commit is contained in:
Arne Fitzenreiter
2010-07-09 00:34:11 +02:00
parent d25238aadf
commit 2789f3574d
2 changed files with 7 additions and 2 deletions

View File

@@ -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"