Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-19 00:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjust blank line option

Browse Source
This commit is contained in:
tschettervictor
2025-04-30 08:19:50 -06:00
parent af24e764bc
commit bef2ece965
23 changed files with 100 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/share/bastille/destroy.sh
View File

@@ -60,7 +60,7 @@ destroy_jail() {
else
info "[${_jail}]:"
error_notify "Jail is running."
error_continue "Use [-a|--auto] to auto-stop the jail."
error_continue_next_jail "Use [-a|--auto] to auto-stop the jail."
fi
if [ -d "${bastille_jail_base}" ]; then
@@ -68,7 +68,7 @@ destroy_jail() {
mount_points="$(mount | cut -d ' ' -f 3 | grep ${bastille_jail_base}/root/)"
if [ -n "${mount_points}" ]; then
error_notify "Failed to destroy jail: ${_jail}"
error_continue "Jail has mounted filesystems:\n$mount_points"
error_continue_next_jail "Jail has mounted filesystems:\n$mount_points"
fi
info "Deleting Jail: ${_jail}."
if checkyesno bastille_zfs_enable; then
@@ -82,7 +82,7 @@ destroy_jail() {
# This will deal with the common "cannot unmount 'XYZ': pool or dataset is busy"
# unless the force option is defined by the user, otherwise will have a partially deleted jail.
if ! zfs destroy "${OPTIONS}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"; then
error_continue "[ERROR]: Jail dataset(s) appears to be busy, exiting."
error_continue_next_jail "[ERROR]: Jail dataset(s) appears to be busy, exiting."
fi
fi
fi