Check if bastille_zfs_enable is actually set to NO

Check if bastille_zfs_enable is actually set to NO before zfs disable
This commit is contained in:
JRGTH
2025-10-13 07:33:21 -04:00
parent 9c10025dfd
commit 0e3ceeee70
3 changed files with 5 additions and 2 deletions

View File

@@ -3,6 +3,7 @@
======================
Version Description
1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable.
1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO.
1.2.15......Minor code changes/improvements.
1.2.14......Make sure bastille-prefix ends with bastille.

4
bastille-init Normal file → Executable file
View File

@@ -1392,7 +1392,9 @@ rc_params()
if zfs list -H "${CWDIR}" | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
zfs_support_error
else
zfs_support_disabled
if [ "${bastille_zfs_enable}" = "NO" ] || [ "${bastille_zfs_enable}" = "no" ]; then
zfs_support_disabled
fi
fi
fi

View File

@@ -1 +1 @@
1.2.16
1.2.17