From f3c59206679cc0cf7fba904a4864ef668ce8c453 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 26 Jul 2017 13:31:32 +0200 Subject: [PATCH] ppp: remove specific DNS scripts NetworkManager manages the 'resolv.conf' file globally, so there is no need for pppd specific scripts for DNS. These scripts race with NM to set DNS, leading sometimes to a scenario where you have ethernet as the default gateway, but with DNS only reachable via cellular. While on it, also remove not used 'mm_cellular' configuration file. Signed-off-by: Javier Viguera --- .../ppp/ppp-2.4.7/mm_cellular | 26 ------------------- .../ppp/ppp_2.4.7.bbappend | 12 ++++----- 2 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular diff --git a/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular b/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular deleted file mode 100644 index 8329abef5..000000000 --- a/meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular +++ /dev/null @@ -1,26 +0,0 @@ -# Assumes that your IP address is allocated dynamically by the ISP. -noipdefault - -# Try to get the name server addresses from the ISP. -usepeerdns - -# Use this connection as the default route. -defaultroute - -# Replace default route if already exists. -replacedefaultroute - -# Makes pppd "dial again" when the connection is lost. -persist - -# Do not ask the remote to authenticate. -noauth - -# Detach 'pppd' from its controlling terminal -updetach - -# Don't use the modem control lines -local - -# Lock the device to ensure exclusive access -lock diff --git a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend index a2520ecb4..2e65f3da4 100644 --- a/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend +++ b/meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" +# Copyright (C) 2017 Digi International Inc. -SRC_URI += "file://mm_cellular" - -do_install_append () { - mkdir -p ${D}${sysconfdir}/ppp/peers - install -m 0755 ${WORKDIR}/mm_cellular ${D}${sysconfdir}/ppp/peers/mm_cellular +do_install_append() { + # NetworkManager manages the 'resolv.conf' file globally, so + # remove the 'pppd' specific scripts for DNS. + rm -f ${D}${sysconfdir}/ppp/ip-up.d/08setupdns + rm -f ${D}${sysconfdir}/ppp/ip-down.d/92removedns }