From owner-svn-src-all@FreeBSD.ORG Sat Jun 11 21:14:22 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F701106566B; Sat, 11 Jun 2011 21:14:22 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 562078FC08; Sat, 11 Jun 2011 21:14:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5BLEMgQ091460; Sat, 11 Jun 2011 21:14:22 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5BLEMmK091456; Sat, 11 Jun 2011 21:14:22 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201106112114.p5BLEMmK091456@svn.freebsd.org> From: Rick Macklem Date: Sat, 11 Jun 2011 21:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222993 - in head/etc: defaults rc.d X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2011 21:14:22 -0000 Author: rmacklem Date: Sat Jun 11 21:14:22 2011 New Revision: 222993 URL: http://svn.freebsd.org/changeset/base/222993 Log: Make three one line changes to the rc scripts so that they work with the new NFS client being the default, since the new NFS client's module name is nfscl and not nfsclient. Modified: head/etc/defaults/rc.conf head/etc/rc.d/mountcritremote head/etc/rc.d/nfsclient Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Sat Jun 11 20:15:19 2011 (r222992) +++ head/etc/defaults/rc.conf Sat Jun 11 21:14:22 2011 (r222993) @@ -89,7 +89,7 @@ fsck_y_enable="NO" # Set to YES to do fs fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS newnfs:NEWNFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). Modified: head/etc/rc.d/mountcritremote ============================================================================== --- head/etc/rc.d/mountcritremote Sat Jun 11 20:15:19 2011 (r222992) +++ head/etc/rc.d/mountcritremote Sat Jun 11 21:14:22 2011 (r222993) @@ -26,7 +26,7 @@ mountcritremote_precmd() case "`mount -d -a -t nfs 2> /dev/null`" in *mount_nfs*) # Handle absent nfs client support - load_kld -m nfs nfsclient || return 1 + load_kld -m nfs nfscl || return 1 ;; esac return 0 Modified: head/etc/rc.d/nfsclient ============================================================================== --- head/etc/rc.d/nfsclient Sat Jun 11 20:15:19 2011 (r222992) +++ head/etc/rc.d/nfsclient Sat Jun 11 21:14:22 2011 (r222993) @@ -13,7 +13,7 @@ name="nfsclient" rcvar="nfs_client_enable" start_cmd="nfsclient_start" stop_cmd="unmount_all" -required_modules="nfsclient:oldnfs" +required_modules="nfscl:nfs" nfsclient_start() {