diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-01-08 21:33:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-01-08 21:33:53 +0000 |
| commit | bd078bad0f43a6de264129b083cf7887d3c2d8d6 (patch) | |
| tree | b9a2ebbf00ba84edd0eedc59e8163746df3a8db6 /package/base-files/files/lib | |
| parent | 403290693826436e69959af15aae9ad1a2ca1dc4 (diff) | |
| download | upstream-bd078bad0f43a6de264129b083cf7887d3c2d8d6.tar.gz upstream-bd078bad0f43a6de264129b083cf7887d3c2d8d6.tar.bz2 upstream-bd078bad0f43a6de264129b083cf7887d3c2d8d6.zip | |
Forward port whiterussian resolv.conf changes
/etc/resolv.conf links to /tmp/resolv.conf
/tmp/resolv.conf links to /tmp/resolv.conf.auto by default (which is where the ISPs nameserver is in)
When dnsmasq starts, it replaces /tmp/resolv.conf with a file pointing to 127.0.0.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6043 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib')
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 845b33eb7e..f3ead6a791 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -120,9 +120,9 @@ setup_interface() { $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" $DEBUG ifconfig "$iface" inet6 add "$ip6addr" [ -z "$gateway" ] || route add default gw "$gateway" - [ -z "$dns" -o -f /tmp/resolv.conf ] || { + [ -z "$dns" -o -f /tmp/resolv.conf.auto ] || { for ns in $dns; do - echo "nameserver $ns" >> /tmp/resolv.conf + echo "nameserver $ns" >> /tmp/resolv.conf.auto done } |