From c6d769e4d54ffcfec7fee50ec1a8eb34dbb30155 Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Sun, 28 Sep 2025 03:56:14 -0400
Subject: [PATCH] Add all bastille Linux flavors bootstrap options

---
 bastille-init | 3 +--
 unionfs.sh    | 9 +++++++--
 version       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bastille-init b/bastille-init
index 73c2106..369b004 100644
--- a/bastille-init
+++ b/bastille-init
@@ -1539,8 +1539,7 @@ bootstrap_dist()
 	# Workaround since XigmaNAS does not ship with debootstrap command.
 	if sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then
 		# List of tested/working Linux distributions on FreeBSD 14.x.
-		#LINUX_FLAVORS="ubuntu-bionic ubuntu-focal ubuntu-jammy ubuntu-noble debian-buster debian-bullseye debian-bookworm"
-		LINUX_FLAVORS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
+		LINUX_FLAVORS="ubuntu-bionic ubuntu-focal ubuntu-jammy ubuntu-noble debian-buster debian-bullseye debian-bookworm"
 		if [ -n "${LINUX_DIST}" ]; then
 			for _linux_flavor in ${LINUX_FLAVORS}; do
 
diff --git a/unionfs.sh b/unionfs.sh
index c01a004..1d1321e 100644
--- a/unionfs.sh
+++ b/unionfs.sh
@@ -52,7 +52,7 @@ error_notify() {
 	MSG="${*}"
 	logger -t "${SCRIPTNAME}" "${MSG}"
 	echo -e "${MSG}" >&2
-	unionfs_disable
+	posterror_exec
 	exit 1
 }
 
@@ -106,6 +106,11 @@ unload_kmods() {
 	fi
 }
 
+posterror_exec() {
+	# Commands to be executed post errors.
+	unionfs_disable
+}
+
 unionfs_disable() {
 	# Check and disable uniofs mounts on error.
 	unionfs_pkgoff
@@ -143,7 +148,7 @@ fetch_pkg() {
 
 	echo "Fetching required packages."
 	# Fetch deboostrap and dependency packages.
-	fetch_cmd || echo "Cleaning addon stale pkg db"
+	fetch_cmd || echo "Cleaning addon stale pkg db and retry..."
 	rm -rf ${CWDIR}/system/var/db/pkg/*
 	fetch_cmd || error_notify "Error while fetching packages, exiting."
 	echo "Done."
diff --git a/version b/version
index 963ed7c..c114700 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.10
+1.2.11