Adding debian version 102-1.debian/102-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 13 deletions

diff --git a/debian/patches/rpc-user b/debian/patches/rpc-user
index 8656109..e9a8b8e 100644
--- a/debian/patches/rpc-user
+++ b/debian/patches/rpc-user
@@ -11,16 +11,16 @@
  
 --- a/modules.d/95nfs/parse-nfsroot.sh
 +++ b/modules.d/95nfs/parse-nfsroot.sh
-@@ -124,5 +124,5 @@
- echo '[ -e $NEWROOT/proc ]' > "$hookdir"/initqueue/finished/nfsroot.sh
- 
+@@ -126,5 +126,5 @@
+ # rpc user needs to be able to write to this directory to save the warmstart
+ # file
  mkdir -p /var/lib/rpcbind
 -chown rpc:rpc /var/lib/rpcbind
 +chown _rpc:root /var/lib/rpcbind
  chmod 770 /var/lib/rpcbind
 --- a/modules.d/95nfs/module-setup.sh
 +++ b/modules.d/95nfs/module-setup.sh
-@@ -125,14 +125,14 @@
+@@ -125,7 +125,7 @@
  
      # Rather than copy the passwd file in, just set a user for rpcbind
      # We'll save the state and restart the daemon from the root anyway
@@ -28,13 +28,4 @@
 +    grep -E '^nfsnobody:|^_rpc:|^rpcuser:' "$dracutsysrootdir"/etc/passwd >> "$initdir/etc/passwd"
      grep -E '^nogroup:|^rpc:|^nobody:' "$dracutsysrootdir"/etc/group >> "$initdir/etc/group"
  
-     # rpc user needs to be able to write to this directory to save the warmstart
-     # file
-     chmod 770 "$initdir/var/lib/rpcbind"
--    grep -q '^rpc:' "$dracutsysrootdir"/etc/passwd \
--        && grep -q '^rpc:' "$dracutsysrootdir"/etc/group
-+    grep -q '^_rpc:' "$dracutsysrootdir"/etc/passwd \
-+        && grep -q '^root:' "$dracutsysrootdir"/etc/group
- 
      dracut_need_initqueue
- }