From owner-svn-ports-head@FreeBSD.ORG  Wed May  8 20:32:00 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 2E4E5809;
 Wed,  8 May 2013 20:32:00 +0000 (UTC)
 (envelope-from bdrewery@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 06D30AEB;
 Wed,  8 May 2013 20:32:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r48KVxcF072620;
 Wed, 8 May 2013 20:31:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48KVxDc072618;
 Wed, 8 May 2013 20:31:59 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201305082031.r48KVxDc072618@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 8 May 2013 20:31:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317708 - in head/sysutils/jail2: . 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: Wed, 08 May 2013 20:32:00 -0000

Author: bdrewery
Date: Wed May  8 20:31:59 2013
New Revision: 317708
URL: http://svnweb.freebsd.org/changeset/ports/317708

Log:
  - Update to 1.1
  
  Changes:
  
    - Correct documentation of enforce_statfs parameter
    - Load devfs rules before starting the jail. This fixes the
      "devfs rules are ignored"-bug.
    - Remove some debug output that sneaked in.
  
  PR:		ports/178344
  Submitted by:	Yamagi Burmeister <yamagi@yamagi.org> (maintainer)

Modified:
  head/sysutils/jail2/Makefile
  head/sysutils/jail2/files/jail2.in

Modified: head/sysutils/jail2/Makefile
==============================================================================
--- head/sysutils/jail2/Makefile	Wed May  8 20:26:42 2013	(r317707)
+++ head/sysutils/jail2/Makefile	Wed May  8 20:31:59 2013	(r317708)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jail2
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	#
 DISTFILES=	#

Modified: head/sysutils/jail2/files/jail2.in
==============================================================================
--- head/sysutils/jail2/files/jail2.in	Wed May  8 20:26:42 2013	(r317707)
+++ head/sysutils/jail2/files/jail2.in	Wed May  8 20:31:59 2013	(r317708)
@@ -12,7 +12,7 @@
 # To manage ZFS datasets within a jail the dataset must have
 # set the parameter "jailed" to 1. Additionally the jail must
 # have set the proberties "allow.mount", "allow.mount.zfs"
-# and "enforce_statfs" to value lesser than 2.
+# and "enforce_statfs" to 0.
 
 # PROVIDE: jail
 # REQUIRE: LOGIN cleanvar
@@ -31,6 +31,8 @@ jail2_start()
 {
 	echo -n "Starting jails: "
 
+	devfs_init_rulesets
+
 	for _j in ${jail2_list}; do
 		echo -n "${_j} "
 
@@ -48,7 +50,6 @@ jail2_start()
 			for _ds in ${_zfs}; do
 				_jailed=`zfs get -H jailed ${_ds} 2>/dev/null | awk '{ print $3 }'`
 				if [ "${_jailed}" = "on" ]; then
-					echo "zfs jail "${_jid}" ${_ds} 2>/dev/null"
 					zfs jail "${_jid}" ${_ds} 2>/dev/null
 				fi
 			done
@@ -80,7 +81,6 @@ jail2_stop()
 			for _ds in ${_zfs}; do
 				_jailed=`zfs get -H jailed ${_ds} 2>/dev/null | awk '{ print $3 }'`
 				if [ "${_jailed}" = "on" ]; then
-					echo "zfs unjail "${_jid}" ${_ds} 2>/dev/null"
 					zfs unjail "${_jid}" ${_ds} 2>/dev/null
 				fi
 			done