From owner-svn-src-projects@freebsd.org Fri Jun 30 22:13:30 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D394D9BEB1 for ; Fri, 30 Jun 2017 22:13:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC8B77F289; Fri, 30 Jun 2017 22:13:29 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5UMDTbV047459; Fri, 30 Jun 2017 22:13:29 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5UMDTMC047458; Fri, 30 Jun 2017 22:13:29 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201706302213.v5UMDTMC047458@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 30 Jun 2017 22:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r320516 - projects/pnfs-planb-server-stable11/etc/rc.d X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server-stable11/etc/rc.d X-SVN-Commit-Revision: 320516 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2017 22:13:30 -0000 Author: rmacklem Date: Fri Jun 30 22:13:28 2017 New Revision: 320516 URL: https://svnweb.freebsd.org/changeset/base/320516 Log: Update the nfsd /etc/rc.d script to not force nfsuserd startup and to depend on mountcritremote. The latter makes sure that the DS mounts are done before the nfsd starts (I think?). Modified: projects/pnfs-planb-server-stable11/etc/rc.d/nfsd Modified: projects/pnfs-planb-server-stable11/etc/rc.d/nfsd ============================================================================== --- projects/pnfs-planb-server-stable11/etc/rc.d/nfsd Fri Jun 30 22:10:17 2017 (r320515) +++ projects/pnfs-planb-server-stable11/etc/rc.d/nfsd Fri Jun 30 22:13:28 2017 (r320516) @@ -4,7 +4,7 @@ # # PROVIDE: nfsd -# REQUIRE: mountd hostname gssd nfsuserd +# REQUIRE: mountcritremote mountd hostname gssd # KEYWORD: nojail shutdown . /etc/rc.subr @@ -33,8 +33,7 @@ nfsd_precmd() sysctl vfs.nfsd.nfs_privport=0 > /dev/null fi - if checkyesno nfsv4_server_enable || \ - checkyesno nfs_server_managegids; then + if checkyesno nfs_server_managegids; then force_depend nfsuserd || err 1 "Cannot run nfsuserd" fi