{"id":806648,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806648/?format=json","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.0/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170828155604.24229-1-jer@airfi.aero>","date":"2017-08-28T15:56:04","name":"pppd: Do not overwrite /etc/resolv.conf","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"75ab9e7cc159a589738f312e929ec478751b22c2","submitter":{"id":68300,"url":"http://patchwork.ozlabs.org/api/1.0/people/68300/?format=json","name":"Jeroen Roovers","email":"jer@airfi.aero"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170828155604.24229-1-jer@airfi.aero/mbox/","series":[{"id":208,"url":"http://patchwork.ozlabs.org/api/1.0/series/208/?format=json","date":"2017-08-28T15:56:04","name":"pppd: Do not overwrite /etc/resolv.conf","version":1,"mbox":"http://patchwork.ozlabs.org/series/208/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806648/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","Received":["from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xgxQZ5mDDz9s7v\n\tfor ;\n\tTue, 29 Aug 2017 02:03:50 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 8C5EF88B09;\n\tMon, 28 Aug 2017 16:03:45 +0000 (UTC)","from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id HB9BTdN26L3v; Mon, 28 Aug 2017 16:03:44 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id F387E88B11;\n\tMon, 28 Aug 2017 16:03:43 +0000 (UTC)","from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1A2361C232E\n\tfor ;\n\tMon, 28 Aug 2017 16:03:42 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1230586E71\n\tfor ;\n\tMon, 28 Aug 2017 16:03:42 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id q-X6RGlldhRT for ;\n\tMon, 28 Aug 2017 16:03:40 +0000 (UTC)","from lb1-smtp-cloud7.xs4all.net (lb1-smtp-cloud7.xs4all.net\n\t[194.109.24.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 87D9A86C65\n\tfor ; Mon, 28 Aug 2017 16:03:40 +0000 (UTC)","from localhost.localdomain ([212.238.182.54])\n\tby smtp-cloud7.xs4all.net with ESMTPA\n\tid mMOjdB2hqAr7rmMOpdr0kR; Mon, 28 Aug 2017 17:56:28 +0200"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"delayed 00:07:10 by SQLgrey-1.7.6","From":"Jeroen Roovers ","To":"buildroot@buildroot.org","Date":"Mon, 28 Aug 2017 17:56:04 +0200","Message-Id":"<20170828155604.24229-1-jer@airfi.aero>","X-Mailer":"git-send-email 2.14.1","X-CMAE-Envelope":"MS4wfHZP2D5uKk5dFlEc/pk07J99nlzzusiEIvteoYZfhrKRs61jKzGNjN9/wBVo0XRMnQnWqx3x/T4W4jMnUsECWmnULzQzsIVDSAwnIl3j3a33JkUOapQX\n\tElHh/neVqQTPGTgGNJWgZ7CZijyvDNU5OMkjH966S0N10rkZ/rMTcc6ne6rG8LzLyNR8Blg61S/W2Q==","Subject":"[Buildroot] [PATCH] pppd: Do not overwrite /etc/resolv.conf","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"With option usepeerdns, pppd by default writes to /etc/ppp/resolv.conf,\nwhich is not very useful and might be impossible. However, when more\nthan one interface can be used for DNS resolution, pppd will overwrite\nany existing entries when /etc/resolv.conf is used instead, which is\nbad. Fix this by setting the path to a place we assume is always\nwriteable, /tmp/ppp-resolv.conf, and which does not interfere with other\nmechanisms that write DNS resolver configurations.\n---\n package/pppd/pppd.mk | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk\nindex 6139c5b085..47937730d5 100644\n--- a/package/pppd/pppd.mk\n+++ b/package/pppd/pppd.mk\n@@ -36,10 +36,10 @@ PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H\n \n # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is\n # definitely not useful since the C library only uses\n-# /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf\n+# /etc/resolv.conf. Therefore, we change pppd to use /tmp/ppp-resolv.conf\n # instead.\n define PPPD_SET_RESOLV_CONF\n-\t$(SED) 's,ppp/resolv.conf,resolv.conf,' $(@D)/pppd/pathnames.h\n+\t$(SED) 's,/etc/ppp/resolv.conf,/tmp/ppp-resolv.conf,' $(@D)/pppd/pathnames.h\n endef\n PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF\n \n","prefixes":[]}