diff options
Diffstat (limited to 'core/dhcpcd')
-rw-r--r-- | core/dhcpcd/PKGBUILD | 16 | ||||
-rw-r--r-- | core/dhcpcd/dhcpcd.service | 10 | ||||
-rw-r--r-- | core/dhcpcd/dhcpcd_.service | 15 |
3 files changed, 29 insertions, 12 deletions
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index e6cc9b108..246563659 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166650 2012-09-14 11:11:15Z ronald $ +# $Id: PKGBUILD 171912 2012-11-23 13:37:09Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.6.2 -pkgrel=1 +pkgver=5.6.3 +pkgrel=2 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -15,10 +15,11 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d' 'dhcpcd.service') -sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e' + 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service') +sha1sums=('d64b589d15821aa5851fda81078183cc61a3e45a' 'b67b9ce6a2faaca75fea356966a16be2283b7db0' - '3d0542eab1b89a88d56ca427128228ac72c40d1f') + 'd5304eb00828d4ee2fd879addce473ea09c47635' + 'e49e01041f831281a1cd0c97ca21204e0aa07fda') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -51,5 +52,6 @@ package() { echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall # install systemd files - install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service + install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 } diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service index 25a1923ac..4a3bf366a 100644 --- a/core/dhcpcd/dhcpcd.service +++ b/core/dhcpcd/dhcpcd.service @@ -1,13 +1,13 @@ [Unit] -Description=dhcpcd on %I +Description=dhcpcd on all interfaces Wants=network.target Before=network.target [Service] Type=forking -PIDFile=/run/dhcpcd-%I.pid -ExecStart=/sbin/dhcpcd -A -q -w %I -ExecStop=/sbin/dhcpcd -k %I +PIDFile=/run/dhcpcd.pid +ExecStart=/sbin/dhcpcd -q -b +ExecStop=/sbin/dhcpcd -x [Install] -Alias=multi-user.target.wants/dhcpcd@eth0.service +WantedBy=multi-user.target diff --git a/core/dhcpcd/dhcpcd_.service b/core/dhcpcd/dhcpcd_.service new file mode 100644 index 000000000..7c1cdeb71 --- /dev/null +++ b/core/dhcpcd/dhcpcd_.service @@ -0,0 +1,15 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target +BindsTo=sys-subsystem-net-devices-%i.device +After=sys-subsystem-net-devices-%i.device + +[Service] +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 |