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

zfs: Reorder checks

Browse Source
This commit is contained in:
tschettervictor
2025-05-09 12:36:23 -06:00
committed by GitHub
parent a55a26d5e1
commit ce1fb2bb6d
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
usr/local/share/bastille/zfs.sh
View File

@@ -49,17 +49,8 @@ EOF
zfs_jail_dataset() { zfs_jail_dataset() {
# Validate jail state
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille stop "${_jail}"
else
info "\n[${_jail}]:"
error_notify "Jail is running."
error_exit "Use [-a|--auto] to auto-stop the jail."
fi
info "\n[${_jail}]:" info "\n[${_jail}]:"
# Exit if MOUNT or DATASET is empty # Exit if MOUNT or DATASET is empty
if [ -z "${MOUNT}" ] || [ -z "${DATASET}" ]; then if [ -z "${MOUNT}" ] || [ -z "${DATASET}" ]; then
usage usage
@@ -72,12 +63,19 @@ zfs_jail_dataset() {
if grep -hoqsw "${DATASET}" ${bastille_jailsdir}/*/zfs.conf; then if grep -hoqsw "${DATASET}" ${bastille_jailsdir}/*/zfs.conf; then
error_exit "[ERROR]: Dataset already assigned." error_exit "[ERROR]: Dataset already assigned."
fi fi
# Validate jail state
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille stop "${_jail}"
else
error_notify "Jail is running."
error_exit "Use [-a|--auto] to auto-stop the jail."
fi
# Add necessary config variables to jail # Add necessary config variables to jail
bastille config ${_jail} set enforce_statfs 1 bastille config ${_jail} set enforce_statfs 1 >/dev/null
bastille config ${_jail} set allow.mount bastille config ${_jail} set allow.mount >/dev/null
bastille config ${_jail} set allow.mount.devfs bastille config ${_jail} set allow.mount.devfs >/dev/null
bastille config ${_jail} set allow.mount.zfs bastille config ${_jail} set allow.mount.zfs >/dev/null
# Add dataset to zfs.conf # Add dataset to zfs.conf
echo "${DATASET} ${MOUNT}" >> "${bastille_jailsdir}/${_jail}/zfs.conf" echo "${DATASET} ${MOUNT}" >> "${bastille_jailsdir}/${_jail}/zfs.conf"
@@ -89,15 +87,6 @@ zfs_jail_dataset() {
zfs_unjail_dataset() { zfs_unjail_dataset() {
# Validate jail state
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille stop "${_jail}"
else
info "\n[${_jail}]:"
error_notify "Jail is running."
error_exit "Use [-a|--auto] to auto-stop the jail."
fi
info "\n[${_jail}]:" info "\n[${_jail}]:"
# Exit if DATASET is empty # Exit if DATASET is empty
@@ -108,6 +97,14 @@ zfs_unjail_dataset() {
warn "[WARNING]: Dataset does not exist: ${DATASET}" warn "[WARNING]: Dataset does not exist: ${DATASET}"
fi fi
# Validate jail state
check_target_is_stopped "${_jail}" || if [ "${AUTO}" -eq 1 ]; then
bastille stop "${_jail}"
else
error_notify "Jail is running."
error_exit "Use [-a|--auto] to auto-stop the jail."
fi
# Remove dataset from zfs.conf # Remove dataset from zfs.conf
if ! grep -hoqsw "${DATASET}" ${bastille_jailsdir}/${_jail}/zfs.conf; then if ! grep -hoqsw "${DATASET}" ${bastille_jailsdir}/${_jail}/zfs.conf; then
error_exit "[ERROR]: Dataset not present in zfs.conf." error_exit "[ERROR]: Dataset not present in zfs.conf."