On 1/13/25 6:20 PM, Scott Mayhew wrote:
On Mon, 13 Jan 2025, Scott Mayhew wrote:
Two changes in how nfsdctl does version handling and one for rpc.nfsd.
The first patch makes the 'nfsdctl version' command behave according to
the man page for w.r.t handling +4/-4, e.g.
# utils/nfsdctl/nfsdctl
nfsdctl> threads 0
nfsdctl> version
+3.0 +4.0 +4.1 +4.2
nfsdctl> version -4
nfsdctl> version
+3.0 -4.0 -4.1 -4.2
nfsdctl> version +4
nfsdctl> version
+3.0 +4.0 +4.1 +4.2
nfsdctl> version -4 +4.2
nfsdctl> version
+3.0 -4.0 -4.1 +4.2
nfsdctl> ^D
The second patch makes nfsdctl's handling of the nfsd version options in
nfs.conf behave like rpc.nfsd's. This is important since the systemd
service file will fall back to rpc.nfsd if nfsdctl fails. Note that the
v3 version of this patch also makes 'nfsdctl autostart' fail with an
error if no versions and no minor versions are enabled in nfs.conf.
The third patch (also new in this v3 posting) makes rpc.nfsd consider
the 'minorvers' bit field when determining whether any versions have
been enabled. This takes care of two scenarios:
1) When vers4=y but vers4.0=vers4.1=vers4.2=n
2) When vers2=vers3=vers4=n but any of vers4.0/vers4.1/vers4.2=y
Test script and results for test patches attached.
That is a petty thorough... all I had to do is change
the it to point to the installed binaries instead
of the ones in the repo. Thanks!
steved.
-Scott
Scott Mayhew (3):
nfsdctl: tweak the version subcommand behavior
nfsdctl: tweak the nfs.conf version handling
nfsd: fix version sanity check
utils/nfsd/nfsd.c | 29 +++++++++++---
utils/nfsdctl/nfsdctl.c | 86 +++++++++++++++++++++++++++++++++++------
2 files changed, 98 insertions(+), 17 deletions(-)
--
2.45.2
