Changeset 8732


Ignore:
Timestamp:
2007-09-10T22:24:18+02:00 (9 years ago)
Author:
thepeople
Message:

add fix from ticket #2290

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/dnsmasq/files/dnsmasq.init

    r8712 r8732  
    33 
    44START=60 
     5DNS_SERVERS="" 
    56 
    67dhcp_calc() { 
     
    174175        [ -n "$ifname" ] || return 0 
    175176 
     177        config_get dnsserver "$net" dns 
     178        [ -n "$dnsserver" ] && { 
     179                DNS_SERVERS="$DNS_SERVERS $dnsserver" 
     180        } 
     181 
    176182        append_bool "$cfg" ignore "-I $ifname" 
    177183 
     
    235241        /usr/sbin/dnsmasq $args && { 
    236242                rm -f /tmp/resolv.conf 
    237                 cat > /tmp/resolv.conf <<EOF 
    238 nameserver 127.0.0.1 
    239 search lan 
    240 EOF 
     243                DNS_SERVERS="$DNS_SERVERS 127.0.0.1" 
     244                for DNS_SERVER in $DNS_SERVERS ; do 
     245                        echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf 
     246                done     
    241247        } 
    242248} 
Note: See TracChangeset for help on using the changeset viewer.