Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Add Debian keyring and minor code changes

Browse Source
This commit is contained in:
JRGTH
2025-09-23 11:12:05 -04:00
parent 9a6ef9031e
commit 3a24390b0d
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.2.09......Add Debian keyring and minor code changes.
1.2.08......Code cleanup, remove unnecessary statement. 1.2.08......Code cleanup, remove unnecessary statement.
1.2.07......Minor cosmetic/wording changes. 1.2.07......Minor cosmetic/wording changes.
1.2.06......Code changes, symlink bundled files in embedded platforms. 1.2.06......Code changes, symlink bundled files in embedded platforms.
bastille-init
Executable → Regular
+2
View File
@@ -1539,6 +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" 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
@@ -1554,6 +1555,7 @@ bootstrap_dist()
if [ -z "${LINUX_FLAVOR}" ]; then if [ -z "${LINUX_FLAVOR}" ]; then
echo "Available Linux flavors:" echo "Available Linux flavors:"
echo "${LINUX_FLAVORS}" echo "${LINUX_FLAVORS}"
echo -e "\nTo fetch latest debootstrap/keyring packages run 'bastille-init update_debootstrap'"
exit 1 exit 1
fi fi
unionfs.sh
Executable → Regular
+1 -1
View File
@@ -120,7 +120,7 @@ fetch_pkg() {
echo "Fetching required packages." echo "Fetching required packages."
# Fetch deboostrap and dependency packages. # Fetch deboostrap and dependency packages.
pkg fetch -y -d -o ${CWDIR}/system/ debootstrap || error_notify "Error while fetching packages, exiting." pkg fetch -y -d -o ${CWDIR}/system/ debootstrap debian-keyring || error_notify "Error while fetching packages, exiting."
echo "Done." echo "Done."
if df | grep -q "${CWDIR}/system/var/db/pkg"; then if df | grep -q "${CWDIR}/system/var/db/pkg"; then
version
+1 -1
View File
@@ -1 +1 @@
1.2.08 1.2.09