From 9a3ccdcbb7a5c68897ae5a0ae28ee34c935a3e3d Mon Sep 17 00:00:00 2001
From: cryx <cryx@h3q.com>
Date: Sun, 24 Jan 2010 18:33:09 +0000
Subject: - fix adding a .device entry into the fstab of a zfs-backed jail when
 renaming - don't unmount a zfs-backed jail when starting it fails

---
 ezjail-admin | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ezjail-admin')

diff --git a/ezjail-admin b/ezjail-admin
index fe84031..614419c 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -221,6 +221,7 @@ fetchjailinfo () {
     case ${ezjail_imagetype} in
       crypto|bde) ezjail_imagedevice=${ezjail_device_geom%.bde} ;;
       eli)        ezjail_imagedevice=${ezjail_device_geom%.eli} ;;
+      zfs)        ezjail_imagedevice='' ;;
       *)          ezjail_imagedevice=${ezjail_device_geom} ;;
     esac
 
@@ -1267,7 +1268,7 @@ config)
     # rename fstab
     rm -f "/etc/fstab.${ezjail_old_safename}"
     echo -n > "/etc/fstab.${ezjail_safename}"
-    [ "${ezjail_imagetype}" ] && \
+    [ "${ezjail_imagetype}" -a "${ezjail_imagetype}" != "zfs" ] && \
     echo ${ezjail_rootdir}.device ${ezjail_rootdir} ufs rw 0 0 >> "/etc/fstab.${ezjail_safename}"
     echo ${ezjail_jailbase} ${ezjail_rootdir}/basejail nullfs ro 0 0 >> "/etc/fstab.${ezjail_safename}"
 
-- 
cgit v1.2.3