From e9b267d882e7b5c54c7bb899db1141933795b7e2 Mon Sep 17 00:00:00 2001 From: Juan David Hurtado G Date: Sat, 19 Apr 2025 12:21:08 -0500 Subject: [PATCH] setup: fix to use the new BASTILLE_CONFIG variable This helps restore the autoconfiguration for ZFS --- usr/local/share/bastille/setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/local/share/bastille/setup.sh b/usr/local/share/bastille/setup.sh index 71b9d1c0..6f8ec64c 100644 --- a/usr/local/share/bastille/setup.sh +++ b/usr/local/share/bastille/setup.sh @@ -117,11 +117,11 @@ configure_zfs() { bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}') if [ "$(echo "${bastille_zroot}" | wc -l)" -gt 1 ]; then error_notify "Error: Multiple ZFS pools available:\n${bastille_zroot}" - error_notify "Set desired pool using \"sysrc -f ${bastille_config} bastille_zfs_zpool=ZPOOL_NAME\"" - error_exit "Don't forget to also enable ZFS using \"sysrc -f ${bastille_config} bastille_zfs_enable=YES\"" + error_notify "Set desired pool using \"sysrc -f ${BASTILLE_CONFIG} bastille_zfs_zpool=ZPOOL_NAME\"" + error_exit "Don't forget to also enable ZFS using \"sysrc -f ${BASTILLE_CONFIG} bastille_zfs_enable=YES\"" fi - sysrc -f "${bastille_config}" bastille_zfs_enable=YES - sysrc -f "${bastille_config}" bastille_zfs_zpool="${bastille_zroot}" + sysrc -f "${BASTILLE_CONFIG}" bastille_zfs_enable=YES + sysrc -f "${BASTILLE_CONFIG}" bastille_zfs_zpool="${bastille_zroot}" fi }