From owner-svn-ports-head@FreeBSD.ORG  Thu May 16 18:22:09 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 84F6E1E1;
 Thu, 16 May 2013 18:22:09 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7757E97D;
 Thu, 16 May 2013 18:22:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GIM9kM056023;
 Thu, 16 May 2013 18:22:09 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4GIM9DI056021;
 Thu, 16 May 2013 18:22:09 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201305161822.r4GIM9DI056021@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Thu, 16 May 2013 18:22:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318325 - head/security/cfs/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 18:22:09 -0000

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@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):