opal hart: 1 main/dhcpcd: fix rundir and pidfile 2 files changed, 3 insertions(+), 3 deletions(-)
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
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
And please also update checksum -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243722
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3808/mbox | git am -3Learn more about email & git
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"
Jakub Jirutka <no-reply@dispatch.alpinelinux.org>Does dhcpcd create /run/dhcpcd directory if it doesn't exist? -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28452#note_243731
depend() { provide net -- 2.32.0
Dermot Bradley <no-reply@dispatch.alpinelinux.org>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
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