Mirrors/xigmanas-bastille-extension
1
0
Fork 1
mirror of https://github.com/JRGTH/xigmanas-bastille-extension.git synced 2025-12-11 01:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add option for thickjail creation if supported

Browse Source
This commit is contained in:
Jose
2019-11-16 17:46:29 -04:00
parent 7f41e5b18b
commit 9cc370d4ad
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -3,6 +3,7 @@
======================
Version Description
1.0.8......Add option for thickjail creation if supported.
1.0.7......Added 12.1-RELEASE.
1.0.6......Reload page after base release download.
1.0.5......Add missing uninstall code.

1
gui/bastille_manager-lib.inc
View File

@@ -53,6 +53,7 @@ $backup_path = exec("/bin/cat {$configfile} | /usr/bin/grep 'BACKUP_DIR=' | /usr
$bastille_config = "{$rootfolder}/conf/bastille_config";
$jail_dir = "{$rootfolder}/jails";
$image_dir = "ext/bastille/images";
$thick_jail = exec("/usr/local/bin/bastille create | grep -wo '\[option\]'");
// Ensure the root directory is configured.
if ($rootfolder == "")

15
gui/bastille_manager_add.php
View File

@@ -89,10 +89,16 @@ if($_POST):
$interface = $pconfig['interface'];
endif;
if ($_POST['nowstart']):
$cmd = ("/usr/local/bin/bastille create {$jname} {$release} {$ipaddr} {$interface} && /usr/local/bin/bastille start {$jname}");
if($_POST['thickjail']):
$thick_jail = "-T";
else:
$cmd = ("/usr/local/bin/bastille create {$jname} {$release} {$ipaddr} {$interface}");
$thick_jail = "";
endif;
if ($_POST['nowstart']):
$cmd = ("/usr/local/bin/bastille create {$thick_jail} {$jname} {$release} {$ipaddr} {$interface} && /usr/local/bin/bastille start {$jname}");
else:
$cmd = ("/usr/local/bin/bastille create {$thick_jail} {$jname} {$release} {$ipaddr} {$interface}");
endif;
if ($_POST['Create']):
@@ -169,6 +175,9 @@ $document->render();
$b_action = $l_release;
html_combobox2('interface',gettext('Network interface'),$pconfig['interface'],$a_action,'',true,false,'action_change()');
html_combobox2('release',gettext('Base release'),$pconfig['release'],$b_action,'',true,false,'action_change()');
if($thick_jail):
html_checkbox2('thickjail',gettext('Create a thick container'),!empty($pconfig['thickjail']) ? true : false,gettext('These containers consume more space, but are self contained.'),'',false);
endif;
html_checkbox2('nowstart',gettext('Start after creation'),!empty($pconfig['nowstart']) ? true : false,gettext('Start the container after creation.'),'',false);
html_checkbox2('autostart',gettext('Auto start on boot'),!empty($pconfig['autostart']) ? true : false,gettext('Automatically start the container at boot time.'),'',false);
?>

2
version
View File

@@ -1 +1 @@
1.0.7
1.0.8