Implicitly make a new jail persistent if it's set not to attach.
MFC after: 3 days
This commit is contained in:
parent
f8287aa0ac
commit
f4aad87394
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user