From d4931b9b2752f35f31171fbacf20528e1860eff2 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 1 Feb 2021 18:33:27 -0400 Subject: [PATCH] Update GUI pages to work with later bastille releases --- CHANGELOG | 1 + gui/bastille_manager_add.php | 2 +- gui/bastille_manager_tarballs.php | 2 +- version | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bbef1ba..5317dee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.81......Update GUI pages to work with later bastille releases. 1.0.80......Add checking for FreeBSD and HardenedBSD on upgrades. 1.0.79......Don't set template for empty jails, include files for 12.2 release. 1.0.78......Fix for proper bastille config update. diff --git a/gui/bastille_manager_add.php b/gui/bastille_manager_add.php index 8ae2eef..9813f26 100644 --- a/gui/bastille_manager_add.php +++ b/gui/bastille_manager_add.php @@ -197,7 +197,7 @@ $document->render(); html_checkbox2('emptyjail',gettext('Create an empty container'),!empty($pconfig['emptyjail']) ? true : false,gettext('This are ideal for custom builds, experimenting with unsupported RELEASES or Linux jails.'),'',false,false,'emptyjail_change()'); endif; - html_checkbox2('nowstart',gettext('Start after creation'),!empty($pconfig['nowstart']) ? true : false,gettext('Start the container after creation.'),'',false); + html_checkbox2('nowstart',gettext('Start after creation'),!empty($pconfig['nowstart']) ? true : false,gettext('Start the container after creation(May be overridden by later bastille releases).'),'',false); html_checkbox2('autostart',gettext('Auto start on boot'),!empty($pconfig['autostart']) ? true : false,gettext('Automatically start the container at boot time.'),'',false); ?> diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php index d09653f..96e2a38 100644 --- a/gui/bastille_manager_tarballs.php +++ b/gui/bastille_manager_tarballs.php @@ -82,7 +82,7 @@ if($_POST): if (isset($_POST['Download']) && $_POST['Download']): $get_release = $pconfig['release_item']; $check_release = ("{$rootfolder}/releases/{$get_release}"); - $cmd = sprintf('/usr/local/bin/bastille bootstrap %1$s > %2$s',$get_release,$logevent); + $cmd = sprintf('/bin/echo "Y" | /usr/local/bin/bastille bootstrap %1$s > %2$s',$get_release,$logevent); $base_mandatory = "base"; unset($lib32,$ports,$src); diff --git a/version b/version index a747663..818b8de 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.80 +1.0.81