diff options
author | cryx <cryx@h3q.com> | 2009-05-27 23:24:35 +0000 |
---|---|---|
committer | cryx <cryx@h3q.com> | 2009-05-27 23:24:35 +0000 |
commit | 8420b5c98f585b3b57a7ce1ec85466cbe7651bdf (patch) | |
tree | bf84c2828aacf51361e11caf91f64d43340dea12 /ezjail-admin | |
parent | 18ff633ddc11657ef4f790b0daa2ac5e296d8094 (diff) |
Fix ZFS creation when using ezjail-admin install
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin index e004b97..1526d83 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -790,7 +790,8 @@ setup|update) | |||
790 | if [ "${ezjail_use_zfs}" = "YES" ]; then | 790 | if [ "${ezjail_use_zfs}" = "YES" ]; then |
791 | echo "ZFS: manage basejail and newjail" | 791 | echo "ZFS: manage basejail and newjail" |
792 | [ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail" && rm -rf "${ezjail_jailfull}" | 792 | [ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail" && rm -rf "${ezjail_jailfull}" |
793 | /sbin/zfs create -p "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory." | 793 | [ ! -d " ${ezjail_jaildir}" ] && /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_zfs_properties} ${ezjail_jailzfs} |
794 | /sbin/zfs create "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory." | ||
794 | else | 795 | else |
795 | [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}" | 796 | [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}" |
796 | mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory." | 797 | mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory." |