From 0b80c5974446b9573760ddca19d75a3baaf9ab78 Mon Sep 17 00:00:00 2001
From: Bike Dude <admin@hackacad.net>
Date: Wed, 10 Feb 2021 10:27:49 +0100
Subject: [PATCH] minor fixes

---
 usr/local/share/bastille/bootstrap.sh | 5 +++++
 usr/local/share/bastille/create.sh    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index ab3d5549..7d6344dc 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -426,7 +426,9 @@ http?://github.com/*/*|http?://gitlab.com/*/*)
     BASTILLE_TEMPLATE_REPO=$(echo "${1}" | awk -F / '{ print $5 }')
     bootstrap_template
     ;;
+#adding Ubuntu Bionic as valid "RELEASE" for POC @hackacad
 ubuntu_bionic|bionic|ubuntu-bionic)
+    #check and install OS dependencies @hackacad
     if [ ! "$(sysrc -f /boot/loader.conf -n linprocfs_load)" = "YES" ] && [ ! "$(sysrc -f /boot/loader.conf -n linsysfs_load)" = "YES" ] && [ ! "$(sysrc -f /boot/loader.conf -n tmpfs_load)" = "YES" ]; then
         warn "linprocfs_load, linsysfs_load, tmpfs_load not enabled in /boot/loader.conf or linux_enable not active. Should I do that for you?  (N|y)"
         read  answer
@@ -435,6 +437,9 @@ ubuntu_bionic|bionic|ubuntu-bionic)
                 error_exit "Exiting."
                 ;;
             yes|Yes|y|Y)
+                info "Loading modules"
+                kldload linux linux64 linprocfs linsysfs tmpfs
+                info "Persisting modules"
                 sysrc linux_enable=YES
                 sysrc -f /boot/loader.conf linprocfs_load=YES
                 sysrc -f /boot/loader.conf linsysfs_load=YES
diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index d91b492c..160574e6 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -458,7 +458,7 @@ create_jail() {
         if [ -n "${bastille_template_empty}" ]; then
             bastille template "${NAME}" ${bastille_template_empty} --arg BASE_TEMPLATE="${bastille_template_base}" --arg HOST_RESOLV_CONF="${bastille_resolv_conf}"
         fi
-    ## Using templating function to fetch neccesary packges @hackacad
+    ## Using templating function to fetch necessary packges @hackacad
     elif [ -n "${LINUX_JAIL}" ]; then
         info "Fetchting packages..."
         #jexec -l "${NAME}" /bin/bash -c "export DEBIAN_FRONTEND=noninteractive" #SRDEBUG
@@ -681,4 +681,4 @@ if [ -z ${bastille_template_vnet+x} ]; then
     bastille_template_vnet='default/vnet'
 fi
 
-create_jail "${NAME}" "${RELEASE}" "${IP}" "${INTERFACE}"
\ No newline at end of file
+create_jail "${NAME}" "${RELEASE}" "${IP}" "${INTERFACE}"