summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2013-04-01 15:15:06 +0000
committererdgeist <erdgeist@erdgeist.org>2013-04-01 15:15:06 +0000
commit8313cd36ec7db8dcdb44c0dcca295a20d66c149b (patch)
treeb0f84976ef95c9c5497a164b7c6835c610967a7b
parentcfb55eaf01dd78136af783f81e9eb48cde7c5db8 (diff)
We now read and dump the jail_JAIL_parameters variable. So user settings dont get lost. Thanks to Vitaliy.
-rwxr-xr-xezjail-admin2
1 files changed, 2 insertions, 0 deletions
diff --git a/ezjail-admin b/ezjail-admin
index e4646e8..82eac3d 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -180,6 +180,7 @@ writejailinfo () {
180 echo export jail_${ezjail_safename}_zfs_datasets=\"${ezjail_zfs_datasets}\" 180 echo export jail_${ezjail_safename}_zfs_datasets=\"${ezjail_zfs_datasets}\"
181 echo export jail_${ezjail_safename}_cpuset=\"${ezjail_cpuset}\" 181 echo export jail_${ezjail_safename}_cpuset=\"${ezjail_cpuset}\"
182 echo export jail_${ezjail_safename}_fib=\"${ezjail_fib}\" 182 echo export jail_${ezjail_safename}_fib=\"${ezjail_fib}\"
183 echo export jail_${ezjail_safename}_parameters=\"${ezjail_parameters}\"
183 184
184 ) > "${ezjail_destconf}" 185 ) > "${ezjail_destconf}"
185 186
@@ -227,6 +228,7 @@ fetchjailinfo () {
227 eval ezjail_zfs_datasets=\"\$jail_${ezjail_safename}_zfs_datasets\" 228 eval ezjail_zfs_datasets=\"\$jail_${ezjail_safename}_zfs_datasets\"
228 eval ezjail_cpuset=\"\$jail_${ezjail_safename}_cpuset\" 229 eval ezjail_cpuset=\"\$jail_${ezjail_safename}_cpuset\"
229 eval ezjail_fib=\"\$jail_${ezjail_safename}_fib\" 230 eval ezjail_fib=\"\$jail_${ezjail_safename}_fib\"
231 eval ezjail_parameters=\"\$jail_${ezjail_safename}_parameters\"
230 232
231 ezjail_softlink=${ezjail_jaildir}/`basename -- "${ezjail_rootdir}"` 233 ezjail_softlink=${ezjail_jaildir}/`basename -- "${ezjail_rootdir}"`
232 ezjail_devicelink="${ezjail_rootdir}.device" 234 ezjail_devicelink="${ezjail_rootdir}.device"