From 11b6f25167316ca263e6e7c5cabeeeb1863dba85 Mon Sep 17 00:00:00 2001 From: JRGTH Date: Mon, 7 Oct 2024 03:09:54 -0400 Subject: [PATCH] Update release list, added new Debian/Ubuntu distros --- CHANGELOG | 1 + gui/bastille_manager_tarballs.php | 24 +++++++++++++++++------- version | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3ee15d8..ea59369 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.1.38......Update release list, added new Debian/Ubuntu distros. 1.1.37......Workaround to copy host resolv.conf to jail path. 1.1.36......Update bastille config, use current extension path. 1.1.35......Update bastille config. diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php index e955292..ba8d0bb 100644 --- a/gui/bastille_manager_tarballs.php +++ b/gui/bastille_manager_tarballs.php @@ -72,36 +72,42 @@ $sphere_array = $rel_list; if ($linux_compat_support == "YES"): $a_action = [ - '14.0-RELEASE' => gettext('14.0-RELEASE'), + //'14.2-RELEASE' => gettext('14.2-RELEASE'), '14.1-RELEASE' => gettext('14.1-RELEASE'), + '14.0-RELEASE' => gettext('14.0-RELEASE'), + '13.4-RELEASE' => gettext('13.4-RELEASE'), '13.3-RELEASE' => gettext('13.3-RELEASE'), '13.2-RELEASE' => gettext('13.2-RELEASE'), '13.1-RELEASE' => gettext('13.1-RELEASE'), '13.0-RELEASE' => gettext('13.0-RELEASE'), + '12.4-RELEASE' => gettext('12.4-RELEASE'), '12.3-RELEASE' => gettext('12.3-RELEASE'), - //'12.4-RELEASE' => gettext('12.4-RELEASE'), -> To be uncommented when avail '12.2-RELEASE' => gettext('12.2-RELEASE'), '12.1-RELEASE' => gettext('12.1-RELEASE'), '12.0-RELEASE' => gettext('12.0-RELEASE'), '11.4-RELEASE' => gettext('11.4-RELEASE'), '11.3-RELEASE' => gettext('11.3-RELEASE'), '11.2-RELEASE' => gettext('11.2-RELEASE'), - 'ubuntu-bionic' => gettext('Ubuntu-Bionic'), + 'ubuntu-jammy' => gettext('Ubuntu-Jammy'), 'ubuntu-focal' => gettext('Ubuntu-Focal'), - 'debian-stretch' => gettext('Debian-Stretch'), - 'debian-buster' => gettext('Debian-Buster'), + 'ubuntu-bionic' => gettext('Ubuntu-Bionic'), + 'debian-bookworm' => gettext('Debian-Bookworm'), 'debian-bullseye' => gettext('Debian-Bullseye'), + 'debian-buster' => gettext('Debian-Buster'), + //'debian-stretch' => gettext('Debian-Stretch'), -> Obsolete, removed from bastille boostrap. ]; else: $a_action = [ - '14.0-RELEASE' => gettext('14.0-RELEASE'), + //'14.2-RELEASE' => gettext('14.2-RELEASE'), '14.1-RELEASE' => gettext('14.1-RELEASE'), + '14.0-RELEASE' => gettext('14.0-RELEASE'), + '13.4-RELEASE' => gettext('13.4-RELEASE'), '13.3-RELEASE' => gettext('13.3-RELEASE'), '13.2-RELEASE' => gettext('13.2-RELEASE'), '13.1-RELEASE' => gettext('13.1-RELEASE'), '13.0-RELEASE' => gettext('13.0-RELEASE'), + '12.4-RELEASE' => gettext('12.4-RELEASE'), '12.3-RELEASE' => gettext('12.3-RELEASE'), - //'12.4-RELEASE' => gettext('12.4-RELEASE'), -> To be uncommented when avail '12.2-RELEASE' => gettext('12.2-RELEASE'), '12.1-RELEASE' => gettext('12.1-RELEASE'), '12.0-RELEASE' => gettext('12.0-RELEASE'), @@ -182,12 +188,16 @@ if($_POST): $get_release = "Ubuntu_1804"; elseif($get_release == 'ubuntu-focal'): $get_release = "Ubuntu_2004"; + elseif($get_release == 'ubuntu-jammy'): + $get_release = "Ubuntu_2204"; elseif($get_release == 'debian-stretch'): $get_release = "Debian9"; elseif($get_release == 'debian-buster'): $get_release = "Debian10"; elseif($get_release == 'debian-bullseye'): $get_release = "Debian11"; + elseif($get_release == 'debian-bookworm'): + $get_release = "Debian12"; endif; $check_release = ("{$rootfolder}/releases/{$get_release}"); diff --git a/version b/version index 36638c8..54eae6b 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.37 +1.1.38