mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2906 from ajeddeloh/fix-nfs

Browse Source 
net-fs/nfs-utils: fix rpcbind race
This commit is contained in:
Andrew Jeddeloh 2017-11-18 08:37:56 -08:00 committed by GitHub
commit a0c71684ae
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch vendored Normal file
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild → sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild vendored
View File

@ -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" \