- [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN "
- [ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf"
+ [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+
+ 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
+ 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
+ fi
+ [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
+
+ ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`"