From 91bf99f63cf748691ff06f8421b61fefd7f1351f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 23 Nov 2012 15:05:16 +0100
Subject: [PATCH] dhcpcd: change service as suggested by author
 (rsmarples@netbsd via Arch).

---
 srcpkgs/dhcpcd/files/dhcpcd.service  | 5 ++++-
 srcpkgs/dhcpcd/files/dhcpcd@.service | 6 ++++--
 srcpkgs/dhcpcd/template              | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dhcpcd/files/dhcpcd.service b/srcpkgs/dhcpcd/files/dhcpcd.service
index 886a446b907..2d2b4e2c623 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd.service
+++ b/srcpkgs/dhcpcd/files/dhcpcd.service
@@ -4,7 +4,10 @@ Wants=network.target
 Before=network.target
 
 [Service]
-ExecStart=/usr/sbin/dhcpcd -q -B
+Type=forking
+PIDFile=/run/dhcpcd.pid
+ExecStart=/usr/sbin/dhcpcd -q -b
+ExecStop=/usr/sbin/dhcpcd -x
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/dhcpcd/files/dhcpcd@.service b/srcpkgs/dhcpcd/files/dhcpcd@.service
index ce978f80312..a7f192e65a1 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd@.service
+++ b/srcpkgs/dhcpcd/files/dhcpcd@.service
@@ -6,8 +6,10 @@ BindsTo=sys-subsystem-net-devices-%i.device
 After=sys-subsystem-net-devices-%i.device
 
 [Service]
-ExecStart=/usr/sbin/dhcpcd -q -B %I
-ExecStop=/usr/sbin/dhcpcd -k %I
+Type=forking
+PIDFile=/run/dhcpcd-%I.pid
+ExecStart=/usr/sbin/dhcpcd -q -w %I
+ExecStop=/usr/sbin/dhcpcd -x %I
 
 [Install]
 Alias=multi-user.target.wants/dhcpcd@eth0.service
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index f840ac6d4a9..c1438950877 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=5.6.3
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib
  --sysconfdir=/etc --rundir=/run"