diff options
| author | cryx <cryx@h3q.com> | 2010-01-03 20:51:09 +0000 |
|---|---|---|
| committer | cryx <cryx@h3q.com> | 2010-01-03 20:51:09 +0000 |
| commit | 44872cd8fb23aae7428175b6ead4b0de30d1c7f2 (patch) | |
| tree | 3f815f9fe9b42efff6376e350c90dac5a25a9846 /ezjail-admin | |
| parent | a4b7fa2d7578a2294b70e1807e92d1390c265a8e (diff) | |
Check for the mountpoint before setting it.
Diffstat (limited to 'ezjail-admin')
| -rwxr-xr-x | ezjail-admin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin index a7f8222..b953fe4 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
| @@ -867,7 +867,7 @@ install) | |||
| 867 | check_for_zpool | 867 | check_for_zpool |
| 868 | echo "ZFS: manage basejail and newjail" | 868 | echo "ZFS: manage basejail and newjail" |
| 869 | [ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail" && rm -rf "${ezjail_jailfull}" | 869 | [ -d "${ezjail_jailfull}" ] && /sbin/zfs destroy -R "${ezjail_jailzfs}/fulljail" && rm -rf "${ezjail_jailfull}" |
| 870 | /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_jailzfs} | 870 | [ ! -d " ${ezjail_jaildir}" ] && /sbin/zfs create -p -o mountpoint=${ezjail_jaildir} ${ezjail_jailzfs} |
| 871 | /sbin/zfs create -p "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory." | 871 | /sbin/zfs create -p "${ezjail_jailzfs}/fulljail" || exerr "Error: Cannot create temporary Jail directory." |
| 872 | else | 872 | else |
| 873 | [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}" | 873 | [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}" |