Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 May 2013 20:31:59 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317708 - in head/sysutils/jail2: . files
Message-ID:  <201305082031.r48KVxDc072618@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305082031.r48KVxDc072618>