Add all bastille Linux flavors bootstrap options

This commit is contained in:
JRGTH
2025-09-28 03:56:14 -04:00
parent d60abe962d
commit c6d769e4d5
3 changed files with 9 additions and 5 deletions

View File

@@ -1539,8 +1539,7 @@ bootstrap_dist()
# Workaround since XigmaNAS does not ship with debootstrap command. # Workaround since XigmaNAS does not ship with debootstrap command.
if sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then if sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then
# List of tested/working Linux distributions on FreeBSD 14.x. # 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 ubuntu-noble debian-buster debian-bullseye debian-bookworm"
LINUX_FLAVORS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
if [ -n "${LINUX_DIST}" ]; then if [ -n "${LINUX_DIST}" ]; then
for _linux_flavor in ${LINUX_FLAVORS}; do for _linux_flavor in ${LINUX_FLAVORS}; do

View File

@@ -52,7 +52,7 @@ error_notify() {
MSG="${*}" MSG="${*}"
logger -t "${SCRIPTNAME}" "${MSG}" logger -t "${SCRIPTNAME}" "${MSG}"
echo -e "${MSG}" >&2 echo -e "${MSG}" >&2
unionfs_disable posterror_exec
exit 1 exit 1
} }
@@ -106,6 +106,11 @@ unload_kmods() {
fi fi
} }
posterror_exec() {
# Commands to be executed post errors.
unionfs_disable
}
unionfs_disable() { unionfs_disable() {
# Check and disable uniofs mounts on error. # Check and disable uniofs mounts on error.
unionfs_pkgoff unionfs_pkgoff
@@ -143,7 +148,7 @@ fetch_pkg() {
echo "Fetching required packages." echo "Fetching required packages."
# Fetch deboostrap and dependency 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/* rm -rf ${CWDIR}/system/var/db/pkg/*
fetch_cmd || error_notify "Error while fetching packages, exiting." fetch_cmd || error_notify "Error while fetching packages, exiting."
echo "Done." echo "Done."

View File

@@ -1 +1 @@
1.2.10 1.2.11