From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBB601382C5 for ; Thu, 21 May 2020 02:04:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E18C3E0A7C; Thu, 21 May 2020 02:04:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9B21E0A7C for ; Thu, 21 May 2020 02:04:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D143A34F3CF for ; Thu, 21 May 2020 02:04:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56FBB21E for ; Thu, 21 May 2020 02:04:31 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1590026665.35ebb75cbd1bf5df69313ebfd18c63b03c609edf.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/, net-misc/dhcpcd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild net-misc/dhcpcd/dhcpcd-9.0.2.ebuild net-misc/dhcpcd/dhcpcd-9999.ebuild net-misc/dhcpcd/files/dhcpcd.initd-r1 net-misc/dhcpcd/files/dhcpcd.service-r1 X-VCS-Directories: net-misc/dhcpcd/ net-misc/dhcpcd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 35ebb75cbd1bf5df69313ebfd18c63b03c609edf X-VCS-Branch: master Date: Thu, 21 May 2020 02:04:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 77fc1117-786e-443a-973f-f1ad0bb818e6 X-Archives-Hash: 61cc2c5caa033716fc3ada5b00d1a6dc commit: 35ebb75cbd1bf5df69313ebfd18c63b03c609edf Author: Mike Gilbert gentoo org> AuthorDate: Thu May 21 01:56:33 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu May 21 02:04:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ebb75c net-misc/dhcpcd: set rundir=/run/dhcpcd in 9.x Signed-off-by: Mike Gilbert gentoo.org> .../{dhcpcd-9.0.2.ebuild => dhcpcd-9.0.2-r1.ebuild} | 6 +++--- net-misc/dhcpcd/dhcpcd-9999.ebuild | 6 +++--- net-misc/dhcpcd/files/dhcpcd.initd-r1 | 17 +++++++++++++++++ net-misc/dhcpcd/files/dhcpcd.service-r1 | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild similarity index 96% rename from net-misc/dhcpcd/dhcpcd-9.0.2.ebuild rename to net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild index 9656eabee92..ac18c5907ad 100644 --- a/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild @@ -45,7 +45,7 @@ src_configure() { $(use_enable ipv6) $(use_enable privsep) $(usex elibc_glibc '--with-hook=yp.conf' '') - $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") $(usex privsep '--privsepuser=dhcpcd' '') $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" @@ -56,8 +56,8 @@ src_configure() { src_install() { default keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service } pkg_postinst() { diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 9656eabee92..ac18c5907ad 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -45,7 +45,7 @@ src_configure() { $(use_enable ipv6) $(use_enable privsep) $(usex elibc_glibc '--with-hook=yp.conf' '') - $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") $(usex privsep '--privsepuser=dhcpcd' '') $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" @@ -56,8 +56,8 @@ src_configure() { src_install() { default keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/${PN}.initd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service } pkg_postinst() { diff --git a/net-misc/dhcpcd/files/dhcpcd.initd-r1 b/net-misc/dhcpcd/files/dhcpcd.initd-r1 new file mode 100644 index 00000000000..5a872351ab9 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd.initd-r1 @@ -0,0 +1,17 @@ +#!/sbin/openrc-run +# Copyright 2007-2008 Roy Marples +# All rights reserved. Released under the 2-clause BSD license. + +command=${RC_PREFIX}/sbin/dhcpcd +pidfile=${RC_PREFIX}/var/run/dhcpcd/pid +command_args=-q +name="DHCP Client Daemon" + +depend() +{ + provide net + need localmount + use logger network + after bootmisc modules + before dns +} diff --git a/net-misc/dhcpcd/files/dhcpcd.service-r1 b/net-misc/dhcpcd/files/dhcpcd.service-r1 new file mode 100644 index 00000000000..b4309c39b4c --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd.service-r1 @@ -0,0 +1,15 @@ +[Unit] +Description=Lightweight DHCP client daemon +Wants=network.target +Before=network.target network-online.target + +[Service] +Type=forking +ExecStart=/sbin/dhcpcd -q +PIDFile=/run/dhcpcd/pid +# Avoid duplicate output on stderr/syslog +StandardOutput=null +StandardError=null + +[Install] +WantedBy=multi-user.target