From e6f2eaf47a177a8eca054d1d70a1b6287e8c3521 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 16:01:35 +0200 Subject: Adding upstream version 102. Signed-off-by: Daniel Baumann --- modules.d/95nfs/module-setup.sh | 6 ------ modules.d/95nfs/nfs-lib.sh | 2 +- modules.d/95nfs/parse-nfsroot.sh | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'modules.d/95nfs') diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh index 16bafe3..abe1ee5 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -128,11 +128,5 @@ install() { 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 - dracut_need_initqueue } diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh index f000671..7896da9 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -1,7 +1,7 @@ #!/bin/sh type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh -. /lib/net-lib.sh +type get_ip > /dev/null 2>&1 || . /lib/net-lib.sh # TODO: make these things not pollute the calling namespace diff --git a/modules.d/95nfs/parse-nfsroot.sh b/modules.d/95nfs/parse-nfsroot.sh index 0c8dbbb..a07c5f4 100755 --- a/modules.d/95nfs/parse-nfsroot.sh +++ b/modules.d/95nfs/parse-nfsroot.sh @@ -123,6 +123,8 @@ root="$fstype" # shellcheck disable=SC2016 echo '[ -e $NEWROOT/proc ]' > "$hookdir"/initqueue/finished/nfsroot.sh +# 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 chmod 770 /var/lib/rpcbind -- cgit v1.2.3