From 469e528474b23cbdeb37783f76b05be74a22b343 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Fri, 17 Nov 2017 16:37:28 -0800 Subject: [PATCH] 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. --- .../files/nfs-utils-1.3.2-rpcbind-after.patch | 18 ++++++++++++++++++ ...2-r10.ebuild => nfs-utils-1.3.2-r11.ebuild} | 1 + 2 files changed, 19 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch rename sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/{nfs-utils-1.3.2-r10.ebuild => nfs-utils-1.3.2-r11.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch new file mode 100644 index 0000000000..eeecd278cc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch @@ -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 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild index 96b2da0d83..36550f3e98 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild @@ -59,6 +59,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.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-rpcbind-after.patch sed \ -e "/^sbindir/s:= := \"${EPREFIX}\":g" \