~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
7 5

[PATCH] main/dhcpcd: fix rundir and pidfile

opal hart <opal@wowana.me>
Details
Message ID
<20211214122928.11915-1-opal@wowana.me>
DKIM signature
missing
Download raw message
Patch: +3 -3
dhcpcd does not write a pidfile to /run/dhcpcd.pid; this may have been
true in the past, but now it directly writes files (pid, sock, ...) to
the configured rundir. Configure with --rundir=/run/dhcpcd as Gentoo
ebuild for net-misc/dhcpcd does, and direct the initscript to
/run/dhcpcd/pid for pidfile.
---
 main/dhcpcd/APKBUILD     | 4 ++--
 main/dhcpcd/dhcpcd.initd | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 269a068ca9..3a7d18d1b1 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dhcpcd
pkgver=9.4.1
pkgrel=0
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
arch="all"
@@ -26,7 +26,7 @@ build() {
		--localstatedir=/var \
		--libexecdir=/usr/lib/$pkgname \
		--dbdir=/var/lib/$pkgname \
		--rundir=/run \
		--rundir=/run/dhcpcd \
		--enable-ipv6 \
		--without-dev \
		--without-udev
diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd
index aab118242e..217d03ee21 100644
--- a/main/dhcpcd/dhcpcd.initd
+++ b/main/dhcpcd/dhcpcd.initd
@@ -5,7 +5,7 @@ description="DHCP Client Daemon"
command="/sbin/dhcpcd"
command_args="-q ${command_args:-}"
command_args_foreground="-B"
pidfile="/run/dhcpcd.pid"
pidfile="/run/dhcpcd/pid"

depend() {
	provide net
-- 
2.32.0
Details
Message ID
<163948645760.14324.16292616157802898585.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local>
In-Reply-To
<20211214122928.11915-1-opal@wowana.me> (view parent)
DKIM signature
missing
Download raw message
This fix does not correctly address the issue. As I mentioned in !27909 the name of the pidfile created differs depending on whether the machine has a single or multiple network interfaces.

I am still working on a solution to this issue combined with fixing, or disabling, privilege separation.

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_198405
Details
Message ID
<163948959138.14324.13801453883213583097.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local>
In-Reply-To
<163948645760.14324.16292616157802898585.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local> (view parent)
DKIM signature
missing
Download raw message
Wasn't aware that there was a prior attempt at fixing this, sorry

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_198408
Details
Message ID
<164208240918.985.17221349553785911987.gitlab.28452.33597196bb7db4bce1163e633d513009e9667c86@listserv.local>
In-Reply-To
<20211214122928.11915-1-opal@wowana.me> (view parent)
DKIM signature
missing
Download raw message
Sorry to bother you @mailinglist-bot,

but we've detected that this merge request hasn't seen any recent activity. If you need help or want to discuss your approach with developers you can ping `@ncopa`. You can also ask on IRC on `#alpine-devel` on irc.oftc.net. If no further activity occurs in this MR, Alpine developers may close it in the future.

Thanks for your contribution.

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_205992
Details
Message ID
<165631507857.985.18188074028523305545.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local>
In-Reply-To
<163948959138.14324.13801453883213583097.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local> (view parent)
DKIM signature
missing
Download raw message
I think we can merge this in the meanwhile.

Can you please rebase it?

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243720
Details
Message ID
<165631510709.985.18330281686682967158.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local>
In-Reply-To
<165631507857.985.18188074028523305545.gitlab.28452.126994186341e72a7e0cdaadb11fd8ba3264beed@listserv.local> (view parent)
DKIM signature
missing
Download raw message
And please also update checksum

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243722
Details
Message ID
<165632371307.985.2113554716837868202.gitlab.28452.5bb4c805a8e9cc9743a176b5cb963016352aa516@listserv.local>
In-Reply-To
<20211214122928.11915-1-opal@wowana.me> (view parent)
DKIM signature
missing
Download raw message
On Tue, 14 Dec 2021 12:29:28 +0000, opal hart wrote:
>  command_args_foreground="-B"
> -pidfile="/run/dhcpcd.pid"
> +pidfile="/run/dhcpcd/pid"

Does dhcpcd create /run/dhcpcd directory if it doesn't exist?

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243731
Details
Message ID
<165632611138.985.17497208037099679795.gitlab.28452.5bb4c805a8e9cc9743a176b5cb963016352aa516@listserv.local>
In-Reply-To
<165632371307.985.2113554716837868202.gitlab.28452.5bb4c805a8e9cc9743a176b5cb963016352aa516@listserv.local> (view parent)
DKIM signature
missing
Download raw message
On Tue, 14 Dec 2021 12:29:28 +0000, opal hart wrote:
>  command_args_foreground="-B"
> -pidfile="/run/dhcpcd.pid"
> +pidfile="/run/dhcpcd/pid"

Good question. It looks like it does:
https://github.com/NetworkConfiguration/dhcpcd/blob/29f6c47b9e1eac058eee71116e6aa1038e8fef7e/src/dhcpcd.c#L2291

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243732
Reply to thread Export thread (mbox)