From: Harald Hoyer <harald@redhat.com>
Date: Tue, 6 Jun 2017 11:38:29 +0000 (+0200)
Subject: handle rpcbind /run/rpcbind directory
X-Git-Tag: 046~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1856ae95c873a6fe855b3dccd0144f1a96b9e71c;p=thirdparty%2Fdracut.git

handle rpcbind /run/rpcbind directory
---

diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index 307734407..31d90d427 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -70,7 +70,7 @@ install() {
     local _i
     local _nsslibs
     inst_multiple -o portmap rpcbind rpc.statd mount.nfs \
-        mount.nfs4 umount rpc.idmapd sed /etc/netconfig chmod
+        mount.nfs4 umount rpc.idmapd sed /etc/netconfig chmod "$tmpfilesdir/rpcbind.conf"
     inst_multiple /etc/services /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/idmapd.conf
 
     if [[ $hostonly_cmdline == "yes" ]]; then
diff --git a/modules.d/95nfs/nfs-start-rpc.sh b/modules.d/95nfs/nfs-start-rpc.sh
index 19bb0f6d1..694e05e22 100755
--- a/modules.d/95nfs/nfs-start-rpc.sh
+++ b/modules.d/95nfs/nfs-start-rpc.sh
@@ -9,7 +9,10 @@ if modprobe sunrpc || strstr "$(cat /proc/filesystems)" rpc_pipefs; then
     # Start rpcbind or rpcbind
     # FIXME occasionally saw 'rpcbind: fork failed: No such device' -- why?
     command -v portmap >/dev/null && [ -z "$(pidof portmap)" ] && portmap
-    command -v rpcbind >/dev/null && [ -z "$(pidof rpcbind)" ] && rpcbind
+    if command -v rpcbind >/dev/null && [ -z "$(pidof rpcbind)" ]; then
+        mkdir -p /run/rpcbind
+        rpcbind
+    fi
 
     # Start rpc.statd as mount won't let us use locks on a NFSv4
     # filesystem without talking to it. NFSv4 does locks internally,