diff --git a/CHANGELOG b/CHANGELOG index 1dda772..96f793b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.2.09......Add Debian keyring and minor code changes. 1.2.08......Code cleanup, remove unnecessary statement. 1.2.07......Minor cosmetic/wording changes. 1.2.06......Code changes, symlink bundled files in embedded platforms. diff --git a/bastille-init b/bastille-init old mode 100755 new mode 100644 index 88ad118..f014c1e --- a/bastille-init +++ b/bastille-init @@ -1539,6 +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" if [ -n "${LINUX_DIST}" ]; then for _linux_flavor in ${LINUX_FLAVORS}; do @@ -1554,6 +1555,7 @@ bootstrap_dist() if [ -z "${LINUX_FLAVOR}" ]; then echo "Available Linux flavors:" echo "${LINUX_FLAVORS}" + echo -e "\nTo fetch latest debootstrap/keyring packages run 'bastille-init update_debootstrap'" exit 1 fi diff --git a/unionfs.sh b/unionfs.sh old mode 100755 new mode 100644 index 814273e..9ccc38e --- a/unionfs.sh +++ b/unionfs.sh @@ -120,7 +120,7 @@ fetch_pkg() { echo "Fetching required 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." if df | grep -q "${CWDIR}/system/var/db/pkg"; then diff --git a/version b/version index 81ca9ab..5ee34e6 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.08 +1.2.09