diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-05-09 04:31:59 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-05-09 04:31:59 +0800 |
| commit | f8eebd95e07f205dfe53f1141272201aad2894a7 (patch) | |
| tree | 1cd1b32d402e35bf5f46c8b2160d981150881e18 | |
| parent | bb2fb18da3e7f8db8cdae167ce0d328ec0f55a95 (diff) | |
| download | freebsd-ports-gnome-f8eebd95e07f205dfe53f1141272201aad2894a7.tar.gz freebsd-ports-gnome-f8eebd95e07f205dfe53f1141272201aad2894a7.tar.zst freebsd-ports-gnome-f8eebd95e07f205dfe53f1141272201aad2894a7.zip | |
- 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)
| -rw-r--r-- | sysutils/jail2/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/jail2/files/jail2.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/jail2/Makefile b/sysutils/jail2/Makefile index 5f6429b10ad1..edb031dae079 100644 --- a/sysutils/jail2/Makefile +++ b/sysutils/jail2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jail2 -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= sysutils MASTER_SITES= # DISTFILES= # diff --git a/sysutils/jail2/files/jail2.in b/sysutils/jail2/files/jail2.in index cda2e6fcad5c..3066f871dc0a 100644 --- a/sysutils/jail2/files/jail2.in +++ b/sysutils/jail2/files/jail2.in @@ -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 |