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

Minor GUI fixes, revert makewhatis file addition

Browse Source
This commit is contained in:
Jose
2021-02-02 03:36:57 -04:00
parent 91866cadf5
commit 2a52af52eb
6 changed files with 19 additions and 19 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.84......Minor GUI fixes, revert makewhatis file addition.
1.0.83......Improve jail/base update, execute fetch/install commands individually.
1.0.82......Add missing system file to prevent makewhatis not found warning.
1.0.81......Update GUI pages to work with later bastille releases.

5
bastille-init
View File

@@ -391,11 +391,6 @@ include_files()
install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
fi
fi
if [ ! -f "/usr/bin/makewhatis" ]; then
if [ -f "${SYSTEM_INCLUDE}/makewhatis" ]; then
install -m 0555 ${SYSTEM_INCLUDE}/makewhatis /usr/bin/makewhatis
fi
fi
else
sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
fi

BIN
conf/system/include/12.2/makewhatis
View File

Binary file not shown.

14
gui/bastille_manager_jconf.php
View File

@@ -318,12 +318,14 @@ if ($_POST):
// Remove obsolete variable.
exec("/usr/sbin/sysrc -f $configfile -x {$jail_name_def}_AUTO_START");
endif;
$cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Autostart changed successfully.");
else:
$input_errors[] = gtext("Failed to disable autostart.");
if(exec("/usr/sbin/sysrc -f $configfile -qn {$jail_name}_AUTO_START")):
$cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
//$savemsg .= gtext("Autostart changed successfully.");
else:
$input_errors[] = gtext("Failed to disable autostart.");
endif;
endif;
endif;

16
gui/bastille_manager_util.php
View File

@@ -244,13 +244,15 @@ if($_POST):
$container['jailname'] = $_POST['jailname'];
$confirm_name = $pconfig['confirmname'];
$item = $container['jailname'];
$cmd = ("/usr/sbin/sysrc -f {$configfile} -x {$item}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
header('Location: bastille_manager_gui.php');
exit;
else:
$input_errors[] = gtext("Failed to set no-auto.");
if(exec("/usr/sbin/sysrc -f $configfile -qn {$item}_AUTO_START")):
$cmd = ("/usr/sbin/sysrc -f $configfile -x {$item}_AUTO_START");
unset($output,$retval);mwexec2($cmd,$output,$retval);
if($retval == 0):
header('Location: bastille_manager_gui.php');
exit;
else:
$input_errors[] = gtext("Failed to set no-auto.");
endif;
endif;
endif;
break;

2
version
View File

@@ -1 +1 @@
1.0.83
1.0.84