diff options
author | erdgeist <erdgeist@erdgeist.org> | 2013-04-24 02:59:55 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2013-04-24 02:59:55 +0000 |
commit | f236990415d6a0a478668a52a4d524f403be6855 (patch) | |
tree | 47def0d14f015d5bc7140a9447422abe95cef868 | |
parent | c628bd5ca1fe9298f606cefbfff8a9171d78bf6c (diff) |
Use default, even if variable is null, not unset
-rwxr-xr-x | ezjail-admin | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin index 11741b5..835bd33 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -32,8 +32,6 @@ ezjail_jailcfgs="${ezjail_etc}/ezjail" | |||
32 | : ${ezjail_exec_start="/bin/sh /etc/rc"} | 32 | : ${ezjail_exec_start="/bin/sh /etc/rc"} |
33 | 33 | ||
34 | : ${ezjail_use_zfs="NO"} | 34 | : ${ezjail_use_zfs="NO"} |
35 | : ${ezjail_jailzfs=""} | ||
36 | : ${ezjail_zfs_properties=""} | ||
37 | 35 | ||
38 | ezjail_dirlist="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/src usr/share" | 36 | ezjail_dirlist="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/src usr/share" |
39 | ezjail_basesystem="base" | 37 | ezjail_basesystem="base" |
@@ -234,7 +232,7 @@ fetchjailinfo () { | |||
234 | eval ezjail_post_start_script=\"\$jail_${ezjail_safename}_post_start_script\" | 232 | eval ezjail_post_start_script=\"\$jail_${ezjail_safename}_post_start_script\" |
235 | 233 | ||
236 | # Pre ezjail-3.3-jails do not have this set | 234 | # Pre ezjail-3.3-jails do not have this set |
237 | : ${ezjail_parentzfs=${ezjail_jailzfs}} | 235 | : ${ezjail_parentzfs:=${ezjail_jailzfs}} |
238 | 236 | ||
239 | ezjail_softlink=${ezjail_jaildir}/`basename -- "${ezjail_rootdir}"` | 237 | ezjail_softlink=${ezjail_jaildir}/`basename -- "${ezjail_rootdir}"` |
240 | ezjail_devicelink="${ezjail_rootdir}.device" | 238 | ezjail_devicelink="${ezjail_rootdir}.device" |