diff --git PKGBUILD PKGBUILD index 4f0a064..414907e 100644 --- PKGBUILD +++ PKGBUILD @@ -15,12 +15,14 @@ makedepends=('bash' 'iproute2') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} dhcpd4.service dhcpd6.service + dhcp dhcp-4.2.5-client_script-1.patch dhcp-4.2.5-missing_ipv6-1.patch) md5sums=('f68e3c1f00a9af5742bc5e71d567cf93' 'SKIP' - '439ee2f145a1e86dd644cb94a854f8e7' - '588aa85b6fe228c45623185a58d11992' + 'eb1bc6705bfbdd501191717437b074a6' + 'a012e77cb36961bbca0a43b82c5c4732' + 'df4c230d3573b3663c404db8848ca535' '9e4dcf90beec15bfcb6631809cdcc780' 'da655f02f1cf4d95b4708e84e69edbc8') @@ -50,7 +52,7 @@ build() { package_dhcp(){ pkgdesc="A DHCP server, client, and relay agent" - backup=('etc/dhcpd.conf') + backup=('etc/dhcpd.conf', 'etc/conf.d/dhcp') install=dhcp.install cd "${srcdir}/${pkgbase}-${_pkgver}" @@ -58,6 +60,7 @@ package_dhcp(){ install -d "${pkgdir}/var/lib/dhcp" + install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service" install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service" diff --git dhcpd4.service dhcpd4.service index 89f7d25..81dd41b 100644 --- dhcpd4.service +++ dhcpd4.service @@ -4,8 +4,9 @@ After=network.target [Service] Type=forking +EnvironmentFile=-/etc/conf.d/dhcp PIDFile=/run/dhcpd4.pid -ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid +ExecStart=/usr/sbin/dhcpd -4 -pf /run/dhcpd4.pid $DHCP4_ARGS KillSignal=SIGINT [Install] diff --git dhcpd6.service dhcpd6.service index 95d3dc4..8709622 100644 --- dhcpd6.service +++ dhcpd6.service @@ -4,8 +4,9 @@ After=network.target [Service] Type=forking +EnvironmentFile=-/etc/conf.d/dhcp PIDFile=/run/dhcpd6.pid -ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid +ExecStart=/usr/sbin/dhcpd -6 -pf /run/dhcpd6.pid $DHCP6_ARGS KillSignal=SIGINT [Install]