From yamagi@yamagi.org  Sun May  5 09:34:41 2013
Return-Path: <yamagi@yamagi.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 9FDAD78
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 May 2013 09:34:41 +0000 (UTC)
	(envelope-from yamagi@yamagi.org)
Received: from mail.yamagi.org (mail.yamagi.org [IPv6:2a01:4f8:121:2102:1::7])
	by mx1.freebsd.org (Postfix) with ESMTP id 263157DE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 May 2013 09:34:40 +0000 (UTC)
Received: from happy.home.yamagi.org (p579A6312.dip0.t-ipconnect.de [87.154.99.18])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.yamagi.org (Postfix) with ESMTPSA id 37E5E1666312
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 May 2013 11:34:37 +0200 (CEST)
Received: from happy.home.yamagi.org (localhost [127.0.0.1])
	by happy.home.yamagi.org (8.14.5/8.14.5) with ESMTP id r459YWN6080154
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 5 May 2013 11:34:32 +0200 (CEST)
	(envelope-from yamagi@happy.home.yamagi.org)
Received: (from yamagi@localhost)
	by happy.home.yamagi.org (8.14.5/8.14.5/Submit) id r459YWs5080153;
	Sun, 5 May 2013 11:34:32 +0200 (CEST)
	(envelope-from yamagi)
Message-Id: <201305050934.r459YWs5080153@happy.home.yamagi.org>
Date: Sun, 5 May 2013 11:34:32 +0200 (CEST)
From: Yamagi Burmeister <yamagi@yamagi.org>
Reply-To: Yamagi Burmeister <yamagi@yamagi.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [UPDATE] Update sysutils/jail2 to 1.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         178344
>Category:       ports
>Synopsis:       [UPDATE] Update sysutils/jail2 to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 05 09:40:00 UTC 2013
>Closed-Date:    Wed May 08 15:32:03 CDT 2013
>Last-Modified:  Wed May  8 20:40:00 UTC 2013
>Originator:     Yamagi Burmeister
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD happy.home.yamagi.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243792M: Sun Dec 2 17:53:10 CET 2012 root@happy.home.yamagi.org:/usr/obj/usr/src/sys/HAPPY amd64


	
>Description:
This updates sysutils/jail2 to version 1.1. Several bugs were fixed:
- 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.
>How-To-Repeat:
	
>Fix:
Index: Makefile
===================================================================
--- Makefile	(Revision 317405)
+++ Makefile	(Arbeitskopie)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jail2
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	#
 DISTFILES=	#
Index: files/jail2.in
===================================================================
--- files/jail2.in	(Revision 317405)
+++ files/jail2.in	(Arbeitskopie)
@@ -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 @@
 {
 	echo -n "Starting jails: "
 
+	devfs_init_rulesets
+
 	for _j in ${jail2_list}; do
 		echo -n "${_j} "
 
@@ -48,7 +50,6 @@
 			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 @@
 			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 

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Wed May 8 13:35:01 CDT 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178344 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Wed May 8 15:32:02 CDT 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178344 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178344: commit references a PR
Date: Wed,  8 May 2013 20:32:12 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
