From f236990415d6a0a478668a52a4d524f403be6855 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 24 Apr 2013 02:59:55 +0000
Subject: Use default, even if variable is null, not unset

---
 ezjail-admin | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'ezjail-admin')

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"
 : ${ezjail_exec_start="/bin/sh /etc/rc"}
 
 : ${ezjail_use_zfs="NO"}
-: ${ezjail_jailzfs=""}
-: ${ezjail_zfs_properties=""}
 
 ezjail_dirlist="bin boot lib libexec rescue sbin usr/bin usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/src usr/share"
 ezjail_basesystem="base"
@@ -234,7 +232,7 @@ fetchjailinfo () {
   eval ezjail_post_start_script=\"\$jail_${ezjail_safename}_post_start_script\"
 
   # Pre ezjail-3.3-jails do not have this set
-  : ${ezjail_parentzfs=${ezjail_jailzfs}}
+  : ${ezjail_parentzfs:=${ezjail_jailzfs}}
 
   ezjail_softlink=${ezjail_jaildir}/`basename -- "${ezjail_rootdir}"`
   ezjail_devicelink="${ezjail_rootdir}.device"
-- 
cgit v1.2.3