From 94b890be7bc059fb10dec215d4ead0c2d4296ae1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 20 Oct 2014 18:32:32 -0300 Subject: [PATCH] pppd: set resolv.conf directory appropiately /etc/ppp/resolv.conf might not be writable and it's not useful, switch to standard /etc/resolv.conf If users don't want to update dns lookup entries they shouldn't use the "userpeerdns" option. [Thomas: slightly reword the comment in the code.] Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/pppd/pppd.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index eb06eec40..0a8825146 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -35,6 +35,15 @@ endef PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H +# pppd defaults to /etc/ppp/resolv.conf, which not be writable and is +# definitely not useful since the C library only uses +# /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf +# instead. +define PPPD_SET_RESOLV_CONF + $(SED) 's,ppp/resolv.conf,resolv.conf,' $(@D)/pppd/pathnames.h +endef +PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF + define PPPD_CONFIGURE_CMDS $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux