diff options
| author | jamie <jamie@FreeBSD.org> | 2010-08-06 22:04:18 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2010-08-06 22:04:18 +0000 |
| commit | 37e8c8fb796862a417445ab52d57b8bd3a3e133a (patch) | |
| tree | 8c6916d18e172fdc512d0e40d37191137331acc2 /sys/kern | |
| parent | e7da3338b640056d5c2e8bb1ca61500d6afa250b (diff) | |
| download | FreeBSD-src-37e8c8fb796862a417445ab52d57b8bd3a3e133a.zip FreeBSD-src-37e8c8fb796862a417445ab52d57b8bd3a3e133a.tar.gz | |
Implicitly make a new jail persistent if it's set not to attach.
MFC after: 3 days
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_jail.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index ded2379..92e1439 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -599,6 +599,8 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) vfs_flagopt(opts, pr_flag_names[fi], &pr_flags, 1 << fi); vfs_flagopt(opts, pr_flag_nonames[fi], &ch_flags, 1 << fi); } + if ((flags & (JAIL_CREATE | JAIL_UPDATE | JAIL_ATTACH)) == JAIL_CREATE) + pr_flags |= PR_PERSIST; ch_flags |= pr_flags; for (fi = 0; fi < sizeof(pr_flag_jailsys) / sizeof(pr_flag_jailsys[0]); fi++) { @@ -628,12 +630,6 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) ch_flags |= pr_flag_jailsys[fi].new | pr_flag_jailsys[fi].disable; } - if ((flags & (JAIL_CREATE | JAIL_UPDATE | JAIL_ATTACH)) == JAIL_CREATE - && !(pr_flags & PR_PERSIST)) { - error = EINVAL; - vfs_opterror(opts, "new jail must persist or attach"); - goto done_errmsg; - } #ifdef VIMAGE if ((flags & JAIL_UPDATE) && (ch_flags & PR_VNET)) { error = EINVAL; |
