From: Harald Hoyer <harald@redhat.com>
Date: Wed, 18 Jan 2017 09:33:09 +0000 (+0100)
Subject: nfs: dynamically chown /var/lib/rpcbind
X-Git-Tag: 045~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ebf48d2baa7d7cbad7cfc663319f8ca80f76398;p=thirdparty%2Fdracut.git

nfs: dynamically chown /var/lib/rpcbind
---

diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index 0f87761f9..efa720d0c 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -100,7 +100,7 @@ install() {
     inst "$moddir/nfsroot.sh" "/sbin/nfsroot"
     inst "$moddir/nfs-lib.sh" "/lib/nfs-lib.sh"
     mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
-    mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
+    mkdir -m 0770 -p "$initdir/var/lib/rpcbind"
     mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
 
     # Rather than copy the passwd file in, just set a user for rpcbind
@@ -112,7 +112,6 @@ install() {
     # file
     chmod 770 "$initdir/var/lib/rpcbind"
     grep -q '^rpc:' /etc/passwd \
-        && grep -q '^rpc:' /etc/group \
-        && chown rpc:rpc "$initdir/var/lib/rpcbind"
+        && grep -q '^rpc:' /etc/group
     dracut_need_initqueue
 }
diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh
index 54f73d8c2..f715767bb 100755
--- a/modules.d/95nfs/parse-nfsroot.sh
+++ b/modules.d/95nfs/parse-nfsroot.sh
@@ -117,3 +117,7 @@ rootok=1
 root="$fstype"
 
 echo '[ -e $NEWROOT/proc ]' > $hookdir/initqueue/finished/nfsroot.sh
+
+mkdir -p /var/lib/rpcbind
+chown rpc:rpc /var/lib/rpcbind
+chmod 770 /var/lib/rpcbind