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 /usr.sbin | |
| 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 'usr.sbin')
| -rw-r--r-- | usr.sbin/jail/jail.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index 6970ae1..9930dbb 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -470,10 +470,12 @@ main(int argc, char **argv) if (dep_check(j)) continue; if (j->jid < 0) { - if (!(j->flags & (JF_DEPEND | JF_WILD)) - && verbose >= 0) - jail_quoted_warnx(j, - "not found", NULL); + if (!(j->flags & (JF_DEPEND|JF_WILD))) { + if (verbose >= 0) + jail_quoted_warnx(j, + "not found", NULL); + failed(j); + } goto jail_remove_done; } j->comparam = stopcommands; |
