update jail template to latest CBSD 12.1.6

This commit is contained in:
olevole
2020-02-09 14:39:58 +03:00
parent 59e0f4ca86
commit 04f394bb1a
2 changed files with 96 additions and 78 deletions

View File

@@ -3,17 +3,39 @@
relative_path="1"; relative_path="1";
jname="#jname#"; jname="#jname#";
path="#workdir#/jails/#jname#"; path="#workdir#/jails/#jname#";
data="#workdir#/jails-data/#jname#-data";
rcconf="#workdir#/jails-rcconf/rc.conf_#jname#";
# FQDN for environment
host_hostname="#host_hostname#"; host_hostname="#host_hostname#";
# default environment IP
ip4_addr="#ip4_addr#"; ip4_addr="#ip4_addr#";
# start with system boot?
astart="#astart#";
# first NIC hardware address
nic_hwaddr="0";
# create from ZFS snapshot?
zfs_snapsrc="";
# run immediately upon creation
runasap="1";
# bind to interface
interface="#interface#";
rctl_nice="1"
jailskeldir="#workdir#/share/FreeBSD-jail-skel"
jail_profile="default"
mount_devfs="#mount_devfs#"; mount_devfs="#mount_devfs#";
allow_mount="#allow_mount#"; allow_mount="#allow_mount#";
allow_devfs="#allow_devfs#"; allow_devfs="#allow_devfs#";
allow_nullfs="#allow_nullfs#"; allow_nullfs="#allow_nullfs#";
allow_fusefs="0"; allow_fusefs="0";
allow_raw_sockets="1"; allow_raw_sockets="1";
mount_fstab="#workdir#/jails-fstab/fstab.#jname#"; mount_fstab="#workdir#/jails-fstab/#jname#/fstab";
mount_fstab_old="#workdir#/jails-fstab/fstab.#jname#";
arch="native"; arch="native";
mkhostsfile="#mkhostsfile#"; mkhostsfile="1";
devfs_ruleset="#devfs_ruleset#"; devfs_ruleset="#devfs_ruleset#";
ver="#ver#"; ver="#ver#";
basename=""; basename="";
@@ -22,15 +44,10 @@ mount_src="#mount_src#";
mount_obj="#mount_obj#"; mount_obj="#mount_obj#";
mount_kernel="#mount_kernel#"; mount_kernel="#mount_kernel#";
mount_ports="#mount_ports#"; mount_ports="#mount_ports#";
astart="#astart#";
data="#workdir#/jails-data/#jname#-data";
vnet="#vnet#"; vnet="#vnet#";
nic_hwaddr="0";
applytpl="#applytpl#"; applytpl="#applytpl#";
mdsize="#mdsize#"; mdsize="#mdsize#";
rcconf="#workdir#/jails-rcconf/rc.conf_#jname#";
floatresolv="#floatresolv#"; floatresolv="#floatresolv#";
zfs_snapsrc="";
exec_poststart="0"; exec_poststart="0";
exec_poststop=""; exec_poststop="";
@@ -41,21 +58,25 @@ exec_master_poststart="0";
exec_master_poststop="0"; exec_master_poststop="0";
exec_master_prestart="0"; exec_master_prestart="0";
exec_master_prestop="0"; exec_master_prestop="0";
pkg_bootstrap="#pkg_bootstrap#"; pkg_bootstrap="#pkg_bootstrap#";
with_img_helpers="#with_img_helpers#"; with_img_helpers="#with_img_helpers#";
runasap="1";
allow_reserved_ports="1"; allow_reserved_ports="1";
allow_unprivileged_proc_debug="1";
persist="1"; persist="1";
childrenmax="0"; childrenmax="0";
enforce_statfs="1"; enforce_statfs="1";
sysrc_enable="#sysrc_enable#" sysrc_enable="#sysrc_enable#";
interface="#interface#"; mnt_start="0";
jailskeldir="#workdir#/share/FreeBSD-jail-skel"; mnt_stop="0";
jail_profile="default";
# root password allow_mlock="0";
user_pw_root='#user_pw_root#';
exec_start="/bin/sh /etc/rc" exec_start="/bin/sh /etc/rc"
exec_stop="/bin/sh /etc/rc.shutdown" exec_stop="/bin/sh /etc/rc.shutdown"
emulator="jail" emulator="jail"
# root password
user_pw_root='#user_pw_root#';

View File

@@ -1,64 +1,61 @@
# DO NOT EDIT THIS FILE. PLEASE USE INSTEAD: # DO NOT EDIT THIS FILE. PLEASE USE INSTEAD:
# cbsd jconfig jname=#jname# # cbsd jconfig jname=#jname#
relative_path="1"; relative_path="1";
jname="#jname#"; jname="#jname#";
path="#workdir#/jails/#jname#"; path="#workdir#/jails/#jname#";
host_hostname="#host_hostname#"; host_hostname="#host_hostname#";
ip4_addr="#ip4_addr#"; ip4_addr="#ip4_addr#";
mount_devfs="#mount_devfs#"; mount_devfs="#mount_devfs#";
allow_mount="#allow_mount#"; allow_mount="#allow_mount#";
allow_devfs="#allow_devfs#"; allow_devfs="#allow_devfs#";
allow_nullfs="#allow_nullfs#"; allow_nullfs="#allow_nullfs#";
mount_fstab="#workdir#/jails-fstab/fstab.#jname#"; allow_fusefs="0";
arch="native"; allow_raw_sockets="1";
mkhostsfile="#mkhostsfile#"; mount_fstab="#workdir#/jails-fstab/fstab.#jname#";
devfs_ruleset="#devfs_ruleset#"; arch="native";
ver="#ver#"; mkhostsfile="#mkhostsfile#";
basename=""; devfs_ruleset="#devfs_ruleset#";
baserw="#baserw#"; ver="#ver#";
mount_src="#mount_src#"; basename="";
mount_obj="#mount_obj#"; baserw="#baserw#";
mount_kernel="#mount_kernel#"; mount_src="#mount_src#";
mount_ports="#mount_ports#"; mount_obj="#mount_obj#";
astart="#astart#"; mount_kernel="#mount_kernel#";
data="#workdir#/jails-data/#jname#-data"; mount_ports="#mount_ports#";
astart="#astart#";
vnet="#vnet#"; data="#workdir#/jails-data/#jname#-data";
nic_hwaddr="0"; vnet="#vnet#";
applytpl="#applytpl#"; nic_hwaddr="0";
mdsize="#mdsize#"; applytpl="#applytpl#";
rcconf="#workdir#/jails-rcconf/rc.conf_#jname#"; mdsize="#mdsize#";
floatresolv="#floatresolv#"; rcconf="#workdir#/jails-rcconf/rc.conf_#jname#";
floatresolv="#floatresolv#";
zfs_snapsrc=""; zfs_snapsrc="";
exec_poststart="0"; exec_poststart="0";
exec_poststop=""; exec_poststop="";
exec_prestart="0"; exec_prestart="0";
exec_prestop="0"; exec_prestop="0";
exec_master_poststart="0"; exec_master_poststart="0";
exec_master_poststop="0"; exec_master_poststop="0";
exec_master_prestart="0"; exec_master_prestart="0";
exec_master_prestop="0"; exec_master_prestop="0";
pkg_bootstrap="#pkg_bootstrap#";
#CBSD with_img_helpers="#with_img_helpers#";
#pkg_bootstrap="1"; runasap="1";
pkg_bootstrap="#pkg_bootstrap#"; allow_reserved_ports="1";
user_pw_root='#user_pw_root#' persist="1";
interface="#interface#" childrenmax="0";
jailskeldir="#workdir#/share/FreeBSD-jail-skel" enforce_statfs="1";
sysrc_enable="#sysrc_enable#" sysrc_enable="#sysrc_enable#"
jail_profile="default"; interface="#interface#";
exec_start="/bin/sh /etc/rc" jailskeldir="#workdir#/share/FreeBSD-jail-skel";
exec_stop="/bin/sh /etc/rc.shutdown" jail_profile="default";
emulator="jail" # root password
user_pw_root='#user_pw_root#';
with_img_helpers="#with_img_helpers#" exec_start="/bin/sh /etc/rc"
exec_stop="/bin/sh /etc/rc.shutdown"
# CBSD emulator="jail"
#runasap="#runasap#"
runasap="1"