mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-21 14:31:02 +02:00
net-fs/nfs-utils: fix rpcbind race
Make rpcbind an After= for nfs-mountd. This is fixed upstream but hasn't been marked as stable on amd64/arm64 by gentoo. Should fix the nfs races in kola tests.
This commit is contained in:
parent
50b12b4606
commit
469e528474
@ -0,0 +1,18 @@
|
|||||||
|
Fixed in 2.2.1 commit 907426b00bdcd69d9a56ac1870990e8ae8c6fe9f
|
||||||
|
use rpcbind.target instead of .socket (as the upstream commit uses)
|
||||||
|
because the future versions of nfs-server.service activate the socket
|
||||||
|
while ours activate the service.
|
||||||
|
|
||||||
|
diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service
|
||||||
|
index d908afe..587112b 100644
|
||||||
|
--- a/systemd/nfs-mountd.service
|
||||||
|
+++ b/systemd/nfs-mountd.service
|
||||||
|
@@ -3,6 +3,7 @@ Description=NFS Mount Daemon
|
||||||
|
Requires=proc-fs-nfsd.mount
|
||||||
|
After=proc-fs-nfsd.mount
|
||||||
|
After=network.target
|
||||||
|
+After=rpcbind.target
|
||||||
|
BindsTo=nfs-server.service
|
||||||
|
|
||||||
|
Wants=nfs-config.service
|
||||||
|
|
@ -59,6 +59,7 @@ src_prepare() {
|
|||||||
epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
|
epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
|
||||||
epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
|
epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
|
||||||
epatch "${FILESDIR}"/${PN}-1.3.2-background-statd.patch
|
epatch "${FILESDIR}"/${PN}-1.3.2-background-statd.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-1.3.2-rpcbind-after.patch
|
||||||
|
|
||||||
sed \
|
sed \
|
||||||
-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
|
-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
|
Loading…
x
Reference in New Issue
Block a user