Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed an issue cleaning up PBI ZFS mounts:

  • Loading branch information...
commit ea63c81b008d935caac1fd3aba2244e216eeb064 1 parent 30d69a8
@kmoore134 kmoore134 authored
View
4 src-sh/pbi-manager/pbi-manager
@@ -5706,7 +5706,7 @@ check_zfs_ab_destroy()
umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
sync
sleep 3
- zfs destroy ${zDir}
+ zfs destroy -r ${zDir}
rmdir ${zDir} >/dev/null 2>/dev/null
fi
fi
@@ -6841,7 +6841,7 @@ chroot_make_cleanup() {
sleep 1
# If we are running as a result of pbi_autobuild, let it do the ZFS cleanup
if [ -z "${PBI_AB_TMPDIR}" ] ; then
- zfs destroy ${tank}${PBI_CHROOTDIR}
+ zfs destroy -r ${tank}${PBI_CHROOTDIR}
rmdir ${PBI_CHROOTDIR} >/dev/null 2>/dev/null
fi
return
View
4 src-sh/pbi-manager10/pbi-manager
@@ -5864,7 +5864,7 @@ check_zfs_ab_destroy()
umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
sync
sleep 3
- zfs destroy ${zDir}
+ zfs destroy -r ${zDir}
rmdir ${zDir} >/dev/null 2>/dev/null
fi
fi
@@ -7022,7 +7022,7 @@ chroot_make_cleanup() {
sleep 1
# If we are running as a result of pbi_autobuild, let it do the ZFS cleanup
if [ -z "${PBI_AB_TMPDIR}" ] ; then
- zfs destroy ${tank}${PBI_CHROOTDIR}
+ zfs destroy -r ${tank}${PBI_CHROOTDIR}
rmdir ${PBI_CHROOTDIR} >/dev/null 2>/dev/null
fi
return
Please sign in to comment.
Something went wrong with that request. Please try again.