diff options
author | hrs <hrs@FreeBSD.org> | 2013-10-10 09:32:27 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2013-10-10 09:32:27 +0000 |
commit | f8b617128eef2b25bc94fbced03090dd490df5d0 (patch) | |
tree | f3aebe08fc483914f8afaa4500fab2d8e06bf7b7 /etc/rc.subr | |
parent | 028a23e8a8be61d8c8bf8e10c9853997db1eec58 (diff) | |
download | FreeBSD-src-f8b617128eef2b25bc94fbced03090dd490df5d0.zip FreeBSD-src-f8b617128eef2b25bc94fbced03090dd490df5d0.tar.gz |
- Update rc.d/jail to use a jail(8) configuration file instead of
command line options. The "jail_<jname>_*" rc.conf(5) variables for
per-jail configuration are automatically converted to
/var/run/jail.<jname>.conf before the jail(8) utility is invoked.
This is transparently backward compatible.
- Fix a minor bug in jail(8) which prevented it from returning false
when jail -r failed.
Approved by: re (glebius)
Diffstat (limited to 'etc/rc.subr')
-rw-r--r-- | etc/rc.subr | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index aee0c95..152b70e 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -1463,28 +1463,6 @@ devfs_domount() return 0 } -# devfs_mount_jail dir [ruleset] -# Mounts a devfs file system appropriate for jails -# on the directory dir. If ruleset is specified, the ruleset -# it names will be used instead. If present, ruleset must -# be the name of a ruleset as defined in a devfs.rules(5) file. -# This function returns non-zero if an error occurs. -# -devfs_mount_jail() -{ - local jdev rs _me - jdev="$1" - [ -n "$2" ] && rs=$2 || rs="devfsrules_jail" - _me="devfs_mount_jail" - - devfs_init_rulesets - if ! devfs_domount "$jdev" $rs; then - warn "$_me: devfs was not mounted on $jdev" - return 1 - fi - return 0 -} - # Provide a function for normalizing the mounting of memory # filesystems. This should allow the rest of the code here to remain # as close as possible between 5-current and 4-stable. |