jail: add environment/environment_global params

olevole · olevole · commit bbf6367e5cb2 · 2025-03-30T13:40:35.000+03:00
diff --git a/share/jail-arg b/share/jail-arg
@@ -92,6 +92,8 @@ allow_suser \
 allow_extattr \
 allow_adjtime \
 allow_settime \
+environment \
+environment_global \
 "
 
 ###
diff --git a/share/local-jails.schema b/share/local-jails.schema
@@ -7,7 +7,7 @@ exec_master_prestop status exec_timeout exec_fib stop_timeout mount_fdescfs allo
 emulator_flags allow_kmem exec_consolelog jdomain b_order allow_fdescfs allow_sysvipc protected hidden maintenance name allow_reserved_ports \
 childrenmax persist enforce_statfs state_time allow_raw_sockets allow_fusefs allow_linprocfs allow_linsysfs allow_read_msgbuf allow_vmm \
 allow_unprivileged_proc_debug sysvsem sysvshm sysvmsg mnt_start mnt_stop allow_mlock mount_procfs mount_linprocfs mount_linsysfs gid tags \
-ci_gw4 zfs_encryption boot_delay allow_nfsd jnameserver allow_suser allow_extattr allow_adjtime allow_settime"
+ci_gw4 zfs_encryption boot_delay allow_nfsd jnameserver allow_suser allow_extattr allow_adjtime allow_settime environment_global environment"
 
 jname="text default 0 unique PRIMARY KEY"
 jid="integer default 0"
@@ -123,5 +123,8 @@ boot_delay="integer default 0"
 
 jnameserver="text default \"0\""
 
+environment_global="TEXT default \"environment\""
+environment="TEXT default \"environment.local\""
+
 INITDB=""
 CONSTRAINT=""
diff --git a/upgrade/pre-patch-14.2.6.1 b/upgrade/pre-patch-14.2.6.1
@@ -0,0 +1,29 @@
+#!/bin/sh
+#v12.1.3
+# Update jails for environment / environment_global
+: ${distdir="/usr/local/cbsd"}
+[ ! -r "${distdir}/subr/cbsdbootstrap.subr" ] && exit 1
+. ${distdir}/subr/cbsdbootstrap.subr || exit 1
+test_sql_stuff
+
+[ ! -h "${dbdir}/local.sqlite" ] && exit 0
+
+mydb="${dbdir}/local.sqlite"
+
+unset _test _count
+_count=$( ${miscdir}/sqlcli ${mydb} 'SELECT COUNT(jname) FROM jails WHERE emulator="jail"' )
+[ "${_count}" = "0" ] && exit 0	# no jails here
+
+_test=$( ${miscdir}/sqlcli ${mydb} "SELECT environment FROM jails LIMIT 1" )
+if [ -z "${_test}" ]; then
+	${ECHO} "  * ${N1_COLOR}Update jails tables: add environment${N0_COLOR}"
+	${miscdir}/sqlcli ${mydb} "ALTER TABLE jails ADD COLUMN environment TEXT default \"environment.local\""
+fi
+
+_test=$( ${miscdir}/sqlcli ${mydb} "SELECT environment_global FROM jails LIMIT 1" )
+if [ -z "${_test}" ]; then
+	${ECHO} "  * ${N1_COLOR}Update jails tables: add environment_global${N0_COLOR}"
+	${miscdir}/sqlcli ${mydb} "ALTER TABLE jails ADD COLUMN environment_global TEXT default \"environment\""
+fi
+
+exit 0

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,8 @@ allow_suser \`
`92`	`92`	`allow_extattr \`
`93`	`93`	`allow_adjtime \`
`94`	`94`	`allow_settime \`
	`95`	`+environment \`
	`96`	`+environment_global \`
`95`	`97`	`"`
`96`	`98`
`97`	`99`	`###`