From 7e573dde0cddf372cb9e840424e77acb565b58fa Mon Sep 17 00:00:00 2001
From: tschettervictor <85497460+tschettervictor@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:38:33 -0600
Subject: [PATCH] temporary setup command fix

This is simply to avoid issues when the setup command might be run over an existing setup.

It will check each setup subcommand and verify it has not already been configured before attempting to run the setup for the relevant setup step.

This is only temporary, as we would like to get a much more advanced setup command integrated in this or below.

#940
---
 usr/local/share/bastille/setup.sh | 38 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/usr/local/share/bastille/setup.sh b/usr/local/share/bastille/setup.sh
index 8cedee2d..06932ab9 100644
--- a/usr/local/share/bastille/setup.sh
+++ b/usr/local/share/bastille/setup.sh
@@ -43,25 +43,30 @@ fi
 
 # Configure bastille loopback network interface
 configure_network() {
-    info "Configuring ${bastille_network_loopback} loopback interface"
-    sysrc cloned_interfaces+=lo1
-    sysrc ifconfig_lo1_name="${bastille_network_loopback}"
+    if ! sysrc -n cloned_interfaces | grep -oq "lo1"; then
+        info "Configuring ${bastille_network_loopback} loopback interface"
+        sysrc cloned_interfaces+=lo1
+        sysrc ifconfig_lo1_name="${bastille_network_loopback}"
 
-    info "Bringing up new interface: ${bastille_network_loopback}"
-    service netif cloneup
+        info "Bringing up new interface: ${bastille_network_loopback}"
+        service netif cloneup
+    else
+        info "Network has already been configured!"
+    fi
 }
 
 configure_vnet() {
-    info "Configuring bridge interface"
-    sysrc cloned_interfaces+=bridge1
-    sysrc ifconfig_bridge1_name=bastille1
+    if ! sysrc -n cloned_interfaces | grep -oq "bridge1"; then
+        info "Configuring bridge interface"
+        sysrc cloned_interfaces+=bridge1
+        sysrc ifconfig_bridge1_name=bastille1
 
-    info "Bringing up new interface: bastille1"
-    service netif cloneup
+        info "Bringing up new interface: bastille1"
+        service netif cloneup
 
-    if [ ! -f /etc/devfs.rules ]; then
-        info "Creating bastille_vnet devfs.rules"
-        cat << EOF > /etc/devfs.rules
+        if [ ! -f /etc/devfs.rules ]; then
+            info "Creating bastille_vnet devfs.rules"
+            cat << EOF > /etc/devfs.rules
 [bastille_vnet=13]
 add include \$devfsrules_hide_all
 add include \$devfsrules_unhide_basic
@@ -70,6 +75,9 @@ add include \$devfsrules_jail
 add include \$devfsrules_jail_vnet
 add path 'bpf*' unhide
 EOF
+        fi
+    else
+        info "VNET has already been configured!"
     fi
 }
 
@@ -104,7 +112,7 @@ EOF
     sysrc pf_enable=YES
     warn "pf ruleset created, please review ${bastille_pf_conf} and enable it using 'service pf start'."
 else
-    error_exit "${bastille_pf_conf} already exists. Exiting."
+    info "PF has already been configured!"
 fi
 }
 
@@ -112,6 +120,8 @@ fi
 configure_zfs() {
     if [ ! "$(kldstat -m zfs)" ]; then
         info "ZFS module not loaded; skipping..."
+    elif sysrc -f ${BASTILLE_CONFIG} -n bastille_zfs_enable | grep -Eoq "([Y|y][E|e][S|s])"; then
+        info "ZFS has already been configured!"
     else
         ## attempt to determine bastille_zroot from `zpool list`
         bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}')