dhcpcd: removed systemd service

This commit is contained in:
Andrea Brancaleoni 2015-06-02 21:33:17 +02:00
parent edb8e444a0
commit 779c26aac1
3 changed files with 2 additions and 35 deletions

View File

@ -1,13 +0,0 @@
[Unit]
Description=Lightweight DHCP client daemon
Wants=network.target
Before=network.target
[Service]
Type=forking
PIDFile=/run/dhcpcd.pid
ExecStart=/usr/sbin/dhcpcd -q -b
ExecStop=/usr/sbin/dhcpcd -x
[Install]
WantedBy=multi-user.target

View File

@ -1,15 +0,0 @@
[Unit]
Description=Lightweight DHCP client daemon 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 -e "wpa_supplicant_conf=/etc/wpa_supplicant/wpa_supplicant-%I.conf"
ExecStop=/usr/sbin/dhcpcd -x %I
[Install]
Alias=multi-user.target.wants/dhcpcd@%i.service

View File

@ -1,10 +1,9 @@
# Template file for 'dhcpcd' # Template file for 'dhcpcd'
pkgname=dhcpcd pkgname=dhcpcd
version=6.9.0 version=6.9.0
revision=2 revision=3
lib32disabled=yes lib32disabled=yes
build_pie=yes build_pie=yes
build_options="systemd"
build_style=configure build_style=configure
configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run" configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --rundir=/run"
hostmakedepends="ntp pkg-config" hostmakedepends="ntp pkg-config"
@ -14,7 +13,7 @@ short_desc="RFC2131 compliant DHCP client"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="2-clause-BSD" license="2-clause-BSD"
homepage="http://roy.marples.name/projects/dhcpcd" homepage="http://roy.marples.name/projects/dhcpcd"
distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" distfiles="http://ftp.osuosl.org/pub/blfs/conglomeration/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1566a58ef785880c07762ff6c520e974cf42872be5fbb23b4520f4446b120a68 checksum=1566a58ef785880c07762ff6c520e974cf42872be5fbb23b4520f4446b120a68
pre_install() { pre_install() {
@ -22,10 +21,6 @@ pre_install() {
sed -i 's,-B,& -s,' dhcpcd-hooks/10-wpa_supplicant sed -i 's,-B,& -s,' dhcpcd-hooks/10-wpa_supplicant
} }
post_install() { post_install() {
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system
fi
vsv dhcpcd vsv dhcpcd
vsv dhcpcd-eth0 vsv dhcpcd-eth0
# Enable controlgroup by default, to make dhcpcd-ui work. # Enable controlgroup by default, to make dhcpcd-ui work.