svn commit: r318325 - head/security/cfs/files

[Chris Rees]

Author: crees
Date: Thu May 16 18:22:08 2013
New Revision: 318325
URL: http://svnweb.freebsd.org/changeset/ports/318325

Log:
  Use explicit IP for localhost rather than DNS name; this causes ipv6 attempts
  
  PR:		ports/155788
  Submitted by:	System Administrator <root at naboo.vindaloo.com>
  
  Pass flag to mount to disable lockd
  
  PR:		ports/137378
  Submitted by:	kib

Modified:
  head/security/cfs/files/cfsd.in
  head/security/cfs/files/pkg-message.in

Modified: head/security/cfs/files/cfsd.in
==============================================================================
--- head/security/cfs/files/cfsd.in	Thu May 16 17:34:12 2013	(r318324)
+++ head/security/cfs/files/cfsd.in	Thu May 16 18:22:08 2013	(r318325)
@@ -4,6 +4,7 @@
 #
 # PROVIDE: cfsd
 # REQUIRE: mountd
+# KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable cfsd:
 #
@@ -22,7 +23,7 @@ rcvar=cfsd_enable
 
 load_rc_config $name
 
-: ${cfsd_enable=no}
+: ${cfsd_enable:=no}
 : ${cfsd_port=3049}
 : ${cfsd_mountpoint=/crypt}
 
@@ -35,7 +36,7 @@ stop_precmd=cfsd_prestop
 cfsd_poststart()
 {
 	if [ -n "$cfsd_mountpoint" ]; then
-		mount -o port="$cfsd_port",mntudp,nfsv2 localhost:%%CFSD_BOOTSTRAP%% "$cfsd_mountpoint"
+		mount -o port="$cfsd_port",udp,nfsv2,nolockd 127.0.0.1:%%CFSD_BOOTSTRAP%% "$cfsd_mountpoint"
 	fi
 }
 

Modified: head/security/cfs/files/pkg-message.in
==============================================================================
--- head/security/cfs/files/pkg-message.in	Thu May 16 17:34:12 2013	(r318324)
+++ head/security/cfs/files/pkg-message.in	Thu May 16 18:22:08 2013	(r318325)
@@ -3,7 +3,7 @@ Quick start instructions:
 
   - add the following entry to /etc/exports:
 
-    %%CFSD_BOOTSTRAP%% localhost
+    %%CFSD_BOOTSTRAP%% 127.0.0.1
 
   - create the default CFS mountpoint (if you want to use a different
     mountpoint, set the cfsd_mountpoint variable in /etc/rc.conf):