[Midnightbsd-cvs] src [11689] trunk/etc/rc.d: update nfs scripts

[laffer1 at midnightbsd.org]

Revision: 11689
          http://svnweb.midnightbsd.org/src/?rev=11689
Author:   laffer1
Date:     2018-07-08 16:29:09 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
update nfs scripts

Modified Paths:
--------------
    trunk/etc/rc.d/nfsd
    trunk/etc/rc.d/nfsuserd

Modified: trunk/etc/rc.d/nfsd
===================================================================
--- trunk/etc/rc.d/nfsd	2018-07-08 20:27:23 UTC (rev 11688)
+++ trunk/etc/rc.d/nfsd	2018-07-08 20:29:09 UTC (rev 11689)
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-#
 
 # PROVIDE: nfsd
 # REQUIRE: mountd hostname gssd nfsuserd
@@ -46,9 +45,13 @@
 			sysctl vfs.nfsd.nfs_privport=0 > /dev/null
 		fi
 
+		if checkyesno nfsv4_server_enable || \
+		    checkyesno nfs_server_managegids; then
+			force_depend nfsuserd || err 1 "Cannot run nfsuserd"
+		fi
+
 		if checkyesno nfsv4_server_enable; then
 			sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
-			force_depend nfsuserd || err 1 "Cannot run nfsuserd"
 		else
 			echo 'NFSv4 is disabled'
 			sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null

Modified: trunk/etc/rc.d/nfsuserd
===================================================================
--- trunk/etc/rc.d/nfsuserd	2018-07-08 20:27:23 UTC (rev 11688)
+++ trunk/etc/rc.d/nfsuserd	2018-07-08 20:29:09 UTC (rev 11689)
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # $MidnightBSD$
-#
 
 # PROVIDE: nfsuserd
 # REQUIRE: NETWORKING
@@ -15,5 +14,14 @@
 sig_stop="USR1"
 
 load_rc_config $name
+start_precmd="nfsuserd_precmd"
 
+nfsuserd_precmd()
+{
+	if checkyesno nfs_server_managegids; then
+		rc_flags="-manage-gids ${nfsuserd_flags}"
+	fi
+	return 0
+}
+
 run_rc_command "$1"