From 637f44b4c5d8ca07382323241d7e16d04d6b79df Mon Sep 17 00:00:00 2001 From: erdgeist Date: Sun, 14 Feb 2010 23:34:37 +0000 Subject: * Create new jails with jail_JAILNAME_exec_start instead of jail_JAILNAME_exec * ezjail.sh replaces empty _exec_start with _exec and unsets _exec * When writing the config obey old settings, don't overwrite with defaults --- ezjail.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ezjail.sh') diff --git a/ezjail.sh b/ezjail.sh index 426025f..85f39a7 100755 --- a/ezjail.sh +++ b/ezjail.sh @@ -77,6 +77,12 @@ do_cmd() eval ezjail_zfs_datasets=\"\$jail_${ezjail}_zfs_datasets\" eval ezjail_cpuset=\"\$jail_${ezjail}_cpuset\" + # Fix backward compatibility issue + eval ezjail_exec_start=\"\$jail_${ezjail}_exec_start\" + eval ezjail_exec=\"\$jail_${ezjail}_exec\" + eval jail_${ezjail}_exec_start=${ezjail_exec_start:-${ezjail_exec}} + eval unset jail_${ezjail}_exec + # Do we still have a root to run in? [ ! -d "${ezjail_rootdir}" ] && echo " Warning: root directory ${ezjail_rootdir} of ${ezjail} does not exist." && continue -- cgit v1.2.3