Merge pull request #642 from BastilleBSD/support_lowercase

fix logic for rc.conf + bastille.conf ZFS check
2023-11-25 19:15:16 -07:00 · 2023-11-25 19:11:57 -07:00 · 2023-11-25 17:21:49 -07:00
1 changed files with 1 additions and 1 deletions
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -45,7 +45,7 @@ esac
 bastille_root_check

 #Validate if ZFS is enabled in rc.conf and bastille.conf.
-if [ "$(sysrc -n zfs_enable)" = "YES" ] && checkyesno bastille_zfs_enable; then
+if [ "$(sysrc -n zfs_enable)" = "YES" ] && ! checkyesno bastille_zfs_enable; then
    warn "ZFS is enabled in rc.conf but not bastille.conf. Do you want to continue? (N|y)"
    read answer
    case $answer in
Author	SHA1	Message	Date
Christer Edwards	3a4ebc63bb	Merge pull request #642 from BastilleBSD/support_lowercase fix logic for rc.conf + bastille.conf ZFS check	2023-11-25 19:15:16 -07:00
Christer Edwards	c627b1f7fa	fix logic for rc.conf + bastille.conf ZFS check	2023-11-25 19:11:57 -07:00
Christer Edwards	bce28bf89a	Merge pull request #641 from BastilleBSD/setup_vnet add support for bastille_vnet devfs.rules in bastille setup	2023-11-25 17:21:49 -07:00