Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Use sysrc to manage jail startup variables

Browse Source
This commit is contained in:
Jose
2020-10-18 06:48:53 -04:00
parent c862b59c27
commit 408b864848
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.0.74......Use sysrc to manage jail startup variables.
1.0.73......Fix typo and minor changes. 1.0.73......Fix typo and minor changes.
1.0.72......Add jail cloning ability to WebGUI utilities and minor changes. 1.0.72......Add jail cloning ability to WebGUI utilities and minor changes.
1.0.71......Enable all options by default. 1.0.71......Enable all options by default.
gui/bastille_manager_jconf.php
+3 -3
View File
@@ -304,7 +304,7 @@ if ($_POST):
if (isset($_POST['autostart']) && $_POST['autostart']): if (isset($_POST['autostart']) && $_POST['autostart']):
if($jail_name_def !== $jail_name): if($jail_name_def !== $jail_name):
// Remove obsolete variable. // Remove obsolete variable.
exec("/usr/bin/sed -i '' 's/{$jail_name_def}_AUTO_START.*//' $configfile"); exec("/usr/sbin/sysrc -f $configfile -x {$jail_name_def}_AUTO_START");
endif; endif;
$cmd = ("/usr/sbin/sysrc -f $configfile {$jail_name}_AUTO_START=\"YES\""); $cmd = ("/usr/sbin/sysrc -f $configfile {$jail_name}_AUTO_START=\"YES\"");
unset($output,$retval);mwexec2($cmd,$output,$retval); unset($output,$retval);mwexec2($cmd,$output,$retval);
@@ -316,9 +316,9 @@ if ($_POST):
else: else:
if($jail_name_def !== $jail_name): if($jail_name_def !== $jail_name):
// Remove obsolete variable. // Remove obsolete variable.
exec("/usr/bin/sed -i '' 's/{$jail_name_def}_AUTO_START.*//' $configfile"); exec("/usr/sbin/sysrc -f $configfile -x {$jail_name_def}_AUTO_START");
endif; endif;
$cmd = ("/usr/bin/sed -i '' 's/{$jail_name}_AUTO_START.*//' $configfile"); $cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval); unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0): if($retval == 0):
//$savemsg .= gtext("Autostart changed successfully."); //$savemsg .= gtext("Autostart changed successfully.");
gui/bastille_manager_util.php
+1 -1
View File
@@ -241,7 +241,7 @@ if($_POST):
$container['jailname'] = $_POST['jailname']; $container['jailname'] = $_POST['jailname'];
$confirm_name = $pconfig['confirmname']; $confirm_name = $pconfig['confirmname'];
$item = $container['jailname']; $item = $container['jailname'];
$cmd = ("/usr/sbin/sysrc -f {$configfile} {$item}_AUTO_START=\"NO\""); $cmd = ("/usr/sbin/sysrc -f {$configfile} -x {$item}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval); unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0): if($retval == 0):
header('Location: bastille_manager_gui.php'); header('Location: bastille_manager_gui.php');
version
+1 -1
View File
@@ -1 +1 @@
1.0.73 1.0.74