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()
{
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
