Package: ppp
Version: 2.4.5-5.2
Severity: normal
Tags: upstream

please accept this patch adding systemd support to ppp

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: armhf (armv7l)

Kernel: Linux 3.4.0 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ppp depends on:
ii  libc6           2.17-7
ii  libpam-modules  1.1.3-9
ii  libpam-runtime  1.1.3-9
ii  libpam0g        1.1.3-9
ii  libpcap0.8      1.4.0-2
ii  procps          1:3.3.4-2

ppp recommends no packages.

ppp suggests no packages.

-- Configuration Files:
/etc/chatscripts/gprs [Errno 13] Permission denied: u'/etc/chatscripts/gprs'
/etc/chatscripts/pap [Errno 13] Permission denied: u'/etc/chatscripts/pap'

-- no debconf information
>From 3a34c10405f70173d54eaa990b411ee4a7d8a193 Mon Sep 17 00:00:00 2001
From: Shawn Landden <shawnland...@gmail.com>
Date: Sat, 13 Jul 2013 11:09:58 -0700
Subject: [PATCH] add systemd pppd-dns.service

---
 debian/control              |  2 +-
 debian/ppp.pppd-dns         | 22 ----------------------
 debian/ppp.pppd-dns.init    | 22 ++++++++++++++++++++++
 debian/ppp.pppd-dns.service | 10 ++++++++++
 debian/rules                |  4 +++-
 5 files changed, 36 insertions(+), 24 deletions(-)
 delete mode 100644 debian/ppp.pppd-dns
 create mode 100644 debian/ppp.pppd-dns.init
 create mode 100644 debian/ppp.pppd-dns.service

diff --git a/debian/control b/debian/control
index 51c0bb3..95269c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ppp
 Section: admin
 Priority: optional
 Maintainer: Marco d'Itri <m...@linux.it>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpcap0.8-dev, libpam0g-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpcap0.8-dev, libpam0g-dev, zlib1g-dev, dh-systemd
 Standards-Version: 3.9.1
 
 Package: ppp
diff --git a/debian/ppp.pppd-dns b/debian/ppp.pppd-dns
deleted file mode 100644
index 170156e..0000000
--- a/debian/ppp.pppd-dns
+++ /dev/null
@@ -1,22 +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.
-### END INIT INFO
-#
-# Restore /etc/resolv.conf if the system crashed before the ppp link
-# was shut down.
-
-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 --git a/debian/ppp.pppd-dns.init b/debian/ppp.pppd-dns.init
new file mode 100644
index 0000000..170156e
--- /dev/null
+++ b/debian/ppp.pppd-dns.init
@@ -0,0 +1,22 @@
+#!/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.
+### END INIT INFO
+#
+# Restore /etc/resolv.conf if the system crashed before the ppp link
+# was shut down.
+
+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 --git a/debian/ppp.pppd-dns.service b/debian/ppp.pppd-dns.service
new file mode 100644
index 0000000..fda0eef
--- /dev/null
+++ b/debian/ppp.pppd-dns.service
@@ -0,0 +1,10 @@
+[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 --git a/debian/rules b/debian/rules
index a4829c2..d698df2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,8 +108,10 @@ binary-arch: install
 	dh_installman extra/pon.1 extra/pppoe-discovery.8
 	dh_link
 	dh_installlogrotate
-	dh_installinit --init-script=pppd-dns --no-start \
+	dh_systemd_enable -pppp pppd-dns.service
+	dh_installinit --name=pppd-dns --no-start \
 		--update-rcd-params='start 38 S .'
+	dh_systemd_start
 	dh_installpam
 
 ifdef BUILD_UDEB
-- 
1.8.3.2

Reply via email to