From 09dcdd0ec70ccde7f8cf13d168452e8dbe000892 Mon Sep 17 00:00:00 2001
From: yaazkal <yaazkal@gmail.com>
Date: Sat, 13 Jul 2024 17:29:30 -0500
Subject: [PATCH] [REF] clean code for PR#650

---
 usr/local/share/bastille/bootstrap.sh | 5 -----
 usr/local/share/bastille/setup.sh     | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index f87d5cf8..633da1f6 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -212,11 +212,6 @@ bootstrap_directories() {
 }
 
 bootstrap_release() {
-    # Make sure to check/bootstrap directories first.¬
-    NOCACHEDIR=1
-    RELEASE="${DIR_BOOTSTRAP}"
-    bootstrap_directories
-
     ## if release exists quit, else bootstrap additional distfiles
     if [ -f "${bastille_releasesdir}/${RELEASE}/COPYRIGHT" ]; then
         ## check distfiles list and skip existing cached files
diff --git a/usr/local/share/bastille/setup.sh b/usr/local/share/bastille/setup.sh
index 02c12985..aba43f06 100644
--- a/usr/local/share/bastille/setup.sh
+++ b/usr/local/share/bastille/setup.sh
@@ -112,10 +112,6 @@ configure_zfs() {
     else
         ## attempt to determine bastille_zroot from `zpool list`
         bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}')
-        zfs create ${bastille_zfs_options} -o mountpoint=${bastille_prefix} ${bastille_zroot}/bastille || \
-          error_exit "Failed to create zfs dataset 'bastille' in pool '${bastille_zroot}'"
-        chown root:root ${bastille_prefix}
-        chmod 0750 ${bastille_prefix}
         sysrc -f "${bastille_config}" bastille_zfs_enable=YES
         sysrc -f "${bastille_config}" bastille_zfs_zpool="${bastille_zroot}"
     fi