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/ppp | |
| parent | 403290693826436e69959af15aae9ad1a2ca1dc4 (diff) | |
| download | master-187ad058-bd078bad0f43a6de264129b083cf7887d3c2d8d6.tar.gz master-187ad058-bd078bad0f43a6de264129b083cf7887d3c2d8d6.tar.bz2 master-187ad058-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/ppp')
| -rw-r--r-- | package/ppp/Makefile | 2 | ||||
| -rw-r--r-- | package/ppp/files/ppp.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 2938b915ef..dc1f37b0a9 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -124,7 +124,7 @@ define Package/ppp/install $(INSTALL_BIN) ./files/etc/ppp/ip-down $(1)/etc/ppp/ $(INSTALL_DIR) $(1)/etc/ppp/ip-down.d $(INSTALL_DATA) ./files/etc/ppp/options $(1)/etc/ppp/ - ln -sf /tmp/resolv.conf $(1)/etc/ppp/resolv.conf + ln -sf /tmp/resolv.conf.auto $(1)/etc/ppp/resolv.conf endef define Package/ppp-mod-pppoa/install diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 6fd40fbe1e..0bd75fc0a7 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -25,7 +25,7 @@ start_pppd() { [ "$interval" != "$keepalive" ] || interval=5 config_get demand "$cfg" demand - [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf + [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto /usr/sbin/pppd "$@" \ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \ ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \ |