From db145553eae0a581054145504566b8c2a55dd346 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 2 Oct 2020 19:12:03 -0400 Subject: [PATCH] Enable all options by default --- CHANGELOG | 1 + gui/bastille_manager-lib.inc | 2 +- gui/bastille_manager_add.php | 1 - version | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8515534..f678d99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.71......Enable all options by default. 1.0.70......Fix for jail auto-start with names containing dashes. 1.0.69......Fix for jail auto-start settings with names containing dashes. 1.0.68......Remove the -q option in utilities page. diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc index 0ad1023..b2ffa2b 100755 --- a/gui/bastille_manager-lib.inc +++ b/gui/bastille_manager-lib.inc @@ -57,7 +57,7 @@ $config_path = exec("/usr/bin/grep 'BASTILLE_CONFIG=' $configfile | /usr/bin/cut $default_distfiles = exec("/usr/bin/grep 'bastille_bootstrap_archives=' $config_path | /usr/bin/cut -d'\"' -f2"); $jail_dir = "{$rootfolder}/jails"; $image_dir = "ext/bastille/images"; -$options_support = exec("/usr/local/bin/bastille create | grep -wo '\[option\]'"); +$options_support = "yes"; $reldir = "{$rootfolder}/releases"; $backup_path_bastille = exec("/usr/sbin/sysrc -f $rootfolder/bastille-dist/usr/local/etc/bastille/bastille.conf -qn bastille_backupsdir"); $zfs_support = exec("/usr/bin/grep 'ZFS_SUPPORT=' $configfile | /usr/bin/cut -d'\"' -f2"); diff --git a/gui/bastille_manager_add.php b/gui/bastille_manager_add.php index c999a84..8ae2eef 100644 --- a/gui/bastille_manager_add.php +++ b/gui/bastille_manager_add.php @@ -194,7 +194,6 @@ $document->render(); if($options_support): html_checkbox2('thickjail',gettext('Create a thick container'),!empty($pconfig['thickjail']) ? true : false,gettext('These containers consume more space, but are self contained.'),'',false); html_checkbox2('vnetjail',gettext('Enable VNET(VIMAGE)'),!empty($pconfig['vnetjail']) ? true : false,gettext('VNET-enabled containers are attached to a virtual bridge interface for connectivity(Advanced).'),'',false); - 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; diff --git a/version b/version index 9d8637c..1edd062 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.70 +1.0.71