utils/statd/statd.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

systemd/rpc-statd-notify.service | 2 1 + 1 - 0 !
systemd/rpc-statd.service | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 adjust program paths in systemd units

aclocal/kerberos5.m4 | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 support multiarch kerberos paths (closes: #642797).

utils/blkmapd/device-discovery.c | 15 3 + 12 - 0 !
utils/blkmapd/device-discovery.h | 2 2 + 0 - 0 !
utils/blkmapd/device-inq.c | 4 2 + 2 - 0 !
3 files changed, 7 insertions(+), 14 deletions(-)

 blkmapd: fix coredump in bl_add_disk

configure.ac | 12 0 + 12 - 0 !
systemd/Makefile.am | 6 2 + 4 - 0 !
2 files changed, 2 insertions(+), 16 deletions(-)

 [patch 1/4] revert "configure: make modprobe.d directory configurable"

This reverts commit 7d76dd2e6f09a141eb6303b7343baa5c4f9c85ad.

This is part of the full revert of adding support via modprobe.d
configuration to set sysctl settings of NFS-related modules when loading
the modules.

The approach caused problems with sysctl from busybox and with kmod as
reported in Debian (https://bugs.debian.org/1024082).

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/50-nfs.conf | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 [patch 2/4] revert "modprobe: protect against sysctl errors"

This reverts commit 5e60e38aa4ba251ef66610514be5f45c41519e0f.

This is part of the full revert of adding support via modprobe.d
configuration to set sysctl settings of NFS-related modules when loading
the modules.

The approach caused problems with sysctl from busybox and with kmod as
reported in Debian (https://bugs.debian.org/1024082).

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/50-nfs.conf | 16 0 + 16 - 0 !
systemd/Makefile.am | 10 2 + 8 - 0 !
2 files changed, 2 insertions(+), 24 deletions(-)

 [patch 3/4] revert "systemd: apply all sysctl settings when
 NFS-related modules are loaded"

This reverts commit afc7132dfb212ac1f676a5ac36d29a9e06325645.

The approach caused problems with sysctl from busybox and with kmod as
reported in Debian (https://bugs.debian.org/1024082).

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/60-nfs.rules | 21 21 + 0 - 0 !
systemd/Makefile.am | 9 7 + 2 - 0 !
2 files changed, 28 insertions(+), 2 deletions(-)

 [patch 4/4] systemd: apply all sysctl settings through udev rule when
 NFS-related modules are loaded

sysctl settings (e.g.  /etc/sysctl.conf and others) are normally loaded
once at boot.  If the module that implements some settings is no yet
loaded, those settings don't get applied.

Various NFS modules support various sysctl settings.  If they are loaded
after boot, they miss out.

Add a new udev rule configuration to udev/rules.d/60-nfs.rules to apply
the relevant settings when the modules are loaded.

Placing it in the systemd directory similarly as the choice for the
original commit afc7132dfb21 ("systemd: Apply all sysctl settings when
NFS-related modules are loaded").

Link: https://lore.kernel.org/linux-nfs/Y1KoKwu88PulcokW@eldamar.lan/
Link: https://bugs.debian.org/1022172
Link: https://bugs.debian.org/1024082
Suggested-by: Marco d'Itri <md@linux.it>
Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/auth-rpcgss-module.service | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 [patch] auth-rpcgss-module.service: don't fail inside linux
 container.

Only try to load the auth_rpcgss kernel module if we are not executing
inside a Linux container. Otherwise, the auth-rpcgss-module service will
fail inside a Linux container as the loading of kernel modules is
forbidden for the container. Thus, the "/sbin/modprobe -q auth_rpcgss"
call will fail even if the auth_rpcgss kernel module is already loaded.
This situation occurs when the container host has already loaded the
auth_rpcgss kernel module to enable kerberized NFS service for its
containers. This behavior has been tested with kmod up to version
30+20220630-3 (current in bookworm as of 2022-09-20).

Bug-Debian: http://bugs.debian.org/985000
Discussion-Debian: https://salsa.debian.org/kernel-team/nfs-utils/-/merge_requests/7

Signed-off-by: Joachim Falk <joachim.falk@gmx.de>
Signed-off-by: Steve Dickson <steved@redhat.com>

systemd/auth-rpcgss-module.service | 2 1 + 1 - 0 !
systemd/nfs-server.service | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 systemd: don't degrade system state for nfs-clients when krb5 keytab
 present but not containing the nfs/<FQDN> principal

support/export/cache.c | 7 0 + 7 - 0 !
1 file changed, 7 deletions(-)

 exports: fix referrals when --enable-junction=no