diffstat of debian/ for ppp_2.4.7-1+4 ppp_2.4.7-1+4endless1 changelog | 8 ++++++++ ppp.pppd-dns.init | 23 ----------------------- ppp.pppd-dns.service | 10 ---------- rules | 9 --------- 4 files changed, 8 insertions(+), 42 deletions(-) diff -Nru ppp-2.4.7/debian/changelog ppp-2.4.7/debian/changelog --- ppp-2.4.7/debian/changelog 2016-11-11 15:03:42.000000000 +0000 +++ ppp-2.4.7/debian/changelog 2017-08-16 15:30:39.000000000 +0000 @@ -1,3 +1,11 @@ +ppp (2.4.7-1+4endless1) eos; urgency=medium + + * Remove pppd-dns.service and init script. On Endless OS systems, + /etc/resolv.conf is a symlink into /run, so there is nothing to restore + after a crash and reboot. (T18834) + + -- Will Thompson Wed, 16 Aug 2017 16:29:13 +0100 + ppp (2.4.7-1+4) unstable; urgency=medium [ Helmut Grohne ] diff -Nru ppp-2.4.7/debian/ppp.pppd-dns.init ppp-2.4.7/debian/ppp.pppd-dns.init --- ppp-2.4.7/debian/ppp.pppd-dns.init 2015-12-04 09:29:47.000000000 +0000 +++ ppp-2.4.7/debian/ppp.pppd-dns.init 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -#!/bin/sh -e -### BEGIN INIT INFO -# Provides: pppd-dns -# Required-Start: $local_fs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Restore resolv.conf if the system crashed. -# Description: Restore /etc/resolv.conf if the system crashed before the -# ppp link was shut down. -### END INIT INFO - -. /lib/lsb/init-functions - -case "$1" in - start) ;; - stop|restart|force-reload) exit 0 ;; - *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;; -esac - -[ -x /etc/ppp/ip-down.d/0000usepeerdns ] \ - && exec /etc/ppp/ip-down.d/0000usepeerdns - diff -Nru ppp-2.4.7/debian/ppp.pppd-dns.service ppp-2.4.7/debian/ppp.pppd-dns.service --- ppp-2.4.7/debian/ppp.pppd-dns.service 2016-01-27 08:53:58.000000000 +0000 +++ ppp-2.4.7/debian/ppp.pppd-dns.service 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -[Unit] -Description=Restore /etc/resolv.conf if the system crashed before the ppp link was shut down - -[Service] -Type=oneshot -ExecStart=/etc/ppp/ip-down.d/0000usepeerdns - -[Install] -WantedBy=multi-user.target - diff -Nru ppp-2.4.7/debian/rules ppp-2.4.7/debian/rules --- ppp-2.4.7/debian/rules 2016-01-27 08:53:58.000000000 +0000 +++ ppp-2.4.7/debian/rules 2017-08-16 15:27:32.000000000 +0000 @@ -127,15 +127,6 @@ mv $(DIR_PPP)/usr/share/doc/ppp/examples/autopppd \ $(DIR_PPP)/usr/share/doc/ppp/examples/scripts/ -override_dh_systemd_enable: - dh_systemd_enable --name=pppd-dns - -override_dh_installinit: - dh_installinit --name=pppd-dns --no-start - -override_dh_systemd_start: - dh_systemd_start --name=pppd-dns --no-start - override_dh_perl: dh_perl -d --package=ppp-dev dh_perl --no-package=ppp-dev