ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle errors when destroying file systems for zfs jail

Browse Source
This commit is contained in:
erdgeist 2014-06-10 16:56:44 +02:00
parent 52e8ea4a16
commit faf0f1fbde
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ezjail-admin
View File

@ -923,7 +923,14 @@ delete)
[ "${ezjail_image}" ] && rm -f "${ezjail_image}" "${ezjail_image%.img}.device" [ "${ezjail_image}" ] && rm -f "${ezjail_image}" "${ezjail_image%.img}.device"
;; ;;
zfs) zfs)
/sbin/zfs destroy -r ${ezjail_parentzfs}/${ezjail_hostname} if ! /sbin/zfs destroy -r ${ezjail_parentzfs}/${ezjail_hostname}; then
[ "${ezjail_forcestop}" ] || exerr "Error: Could not destroy file system ${ezjail_parentzfs}/${ezjail_hostname} for jail ${ezjail_name}."
echo "Warning: Could not destroy file system ${ezjail_parentzfs}/${ezjail_hostname} for jail ${ezjail_name}."
echo " Sleeping 5 seconds before retrying forcefully."
sleep 5
/sbin/zfs destroy -rf ${ezjail_parentzfs}/${ezjail_hostname} || exerr "Error: Failed to destroy file system."
echo "Success."
fi
;; ;;
*) *)
chflags -R noschg "${ezjail_rootdir}" chflags -R noschg "${ezjail_rootdir}"