diff options
author | erdgeist <erdgeist@erdgeist.org> | 2010-02-14 23:34:37 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2010-02-14 23:34:37 +0000 |
commit | 637f44b4c5d8ca07382323241d7e16d04d6b79df (patch) | |
tree | d9798fe55b2abc882d40c19b74cd02c4a39bad63 /ezjail.sh | |
parent | 6a81003aee05bf15e33989b840abf780771fc2af (diff) |
* 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
Diffstat (limited to 'ezjail.sh')
-rwxr-xr-x | ezjail.sh | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -77,6 +77,12 @@ do_cmd() | |||
77 | eval ezjail_zfs_datasets=\"\$jail_${ezjail}_zfs_datasets\" | 77 | eval ezjail_zfs_datasets=\"\$jail_${ezjail}_zfs_datasets\" |
78 | eval ezjail_cpuset=\"\$jail_${ezjail}_cpuset\" | 78 | eval ezjail_cpuset=\"\$jail_${ezjail}_cpuset\" |
79 | 79 | ||
80 | # Fix backward compatibility issue | ||
81 | eval ezjail_exec_start=\"\$jail_${ezjail}_exec_start\" | ||
82 | eval ezjail_exec=\"\$jail_${ezjail}_exec\" | ||
83 | eval jail_${ezjail}_exec_start=${ezjail_exec_start:-${ezjail_exec}} | ||
84 | eval unset jail_${ezjail}_exec | ||
85 | |||
80 | # Do we still have a root to run in? | 86 | # Do we still have a root to run in? |
81 | [ ! -d "${ezjail_rootdir}" ] && echo " Warning: root directory ${ezjail_rootdir} of ${ezjail} does not exist." && continue | 87 | [ ! -d "${ezjail_rootdir}" ] && echo " Warning: root directory ${ezjail_rootdir} of ${ezjail} does not exist." && continue |
82 | 88 | ||