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 | 656412d1a3806d94b280a9955df528faad6aa8e9 (patch) | |
tree | 012a0788f3f546b5540756e0ee6a57aa223319b7 /package/ppp | |
parent | cd10aa726f1803513f172fff4c194a3cdcb868a3 (diff) | |
download | mtk-20170518-656412d1a3806d94b280a9955df528faad6aa8e9.zip mtk-20170518-656412d1a3806d94b280a9955df528faad6aa8e9.tar.gz mtk-20170518-656412d1a3806d94b280a9955df528faad6aa8e9.tar.bz2 |
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
SVN-Revision: 6043
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 2938b91..dc1f37b 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 6fd40fb..0bd75fc 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} \ |