From 2f5a759f490bb813ec24a685f015b15ff196783b Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Tue, 1 Apr 2025 14:33:38 +0200 Subject: [PATCH] fix(nfs): use `DRACUT_CP` instead of `cp` Using `cp` directly ignores `DRACUT_NO_XATTR`. --- modules.d/95nfs/module-setup.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh index 6c76faf47..d097cd38f 100755 --- a/modules.d/95nfs/module-setup.sh +++ b/modules.d/95nfs/module-setup.sh @@ -120,9 +120,15 @@ install() { mkdir -m 0770 -p "$initdir/var/lib/rpcbind" # use the same directory permissions as the host - [ -d "/var/lib/nfs/statd" ] && cp -a --attributes-only "$dracutsysrootdir"/var/lib/nfs/statd "${initdir}"/var/lib/nfs/ && rm -rf "${initdir}"/var/lib/nfs/statd/* - [ -d "/var/lib/nfs/statd/sm" ] && cp -a --attributes-only "$dracutsysrootdir"/var/lib/nfs/statd/sm "${initdir}"/var/lib/nfs/statd/ && rm -rf "${initdir}"/var/lib/nfs/statd/sm/* - [ -d "/var/lib/nfs/sm" ] && cp -a --attributes-only "$dracutsysrootdir"/var/lib/nfs/sm "${initdir}"/var/lib/nfs/ && rm -rf "${initdir}"/var/lib/nfs/sm/* + [[ -d "$dracutsysrootdir"/var/lib/nfs/statd ]] \ + && $DRACUT_CP -L --preserve=ownership -t "$initdir"/var/lib/nfs "$dracutsysrootdir"/var/lib/nfs/statd \ + && rm -rf "$initdir"/var/lib/nfs/statd/* + [[ -d "$dracutsysrootdir"/var/lib/nfs/statd/sm ]] \ + && $DRACUT_CP -L --preserve=ownership -t "$initdir"/var/lib/nfs/statd "$dracutsysrootdir"/var/lib/nfs/statd/sm \ + && rm -rf "$initdir"/var/lib/nfs/statd/sm/* + [[ -d "$dracutsysrootdir"/var/lib/nfs/sm ]] \ + && $DRACUT_CP -L --preserve=ownership -t "$initdir"/var/lib/nfs "$dracutsysrootdir"/var/lib/nfs/sm \ + && rm -rf "$initdir"/var/lib/nfs/sm/* # 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 -- 2.47.3