From 44872cd8fb23aae7428175b6ead4b0de30d1c7f2 Mon Sep 17 00:00:00 2001
From: cryx <cryx@h3q.com>
Date: Sun, 3 Jan 2010 20:51:09 +0000
Subject: Check for the mountpoint before setting it.
---
ezjail-admin | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ezjail-admin')
diff --git a/ezjail-admin b/ezjail-admin
index a7f8222..b953fe4 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -867,7 +867,7 @@ install)
check_for_zpool
echo "ZFS: manage basejail and newjail"
[ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail" && rm -rf "${ezjail_jailfull}"
- /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_jailzfs}
+ [ ! -d " ${ezjail_jaildir}" ] && /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_jailzfs}
/sbin/zfs create -p "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory."
else
[ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
--
cgit v1.2.3