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

Make sure minor changes are always applied

Browse Source
This commit is contained in:
JRGTH
2025-11-02 04:30:09 -04:00
parent 7452d2a08e
commit 4831551b4f
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.2.22......Make sure minor changes are always applied.
1.2.21......Check/update bastille config parameters on runtime. 1.2.21......Check/update bastille config parameters on runtime.
1.2.20......Allow install in zroot platform with optional zfs dataset. 1.2.20......Allow install in zroot platform with optional zfs dataset.
1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux. 1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux.

7
bastille-init Normal file → Executable file
View File

@@ -1226,15 +1226,12 @@ get_versions()
post_upgrade() post_upgrade()
{ {
# Check/apply for required/pending updates/fixes if any. # This function is intended to apply several/temporary changes to the extension once.
# This file will be removed after success execution.
if sysrc -f ${CWDIR}${EXTCONF} -qc EXTENSION_UPGRADED=1; then if sysrc -f ${CWDIR}${EXTCONF} -qc EXTENSION_UPGRADED=1; then
if [ -f "${CWDIR}/post_upgrade.sh" ]; then if [ -f "${CWDIR}/post_upgrade.sh" ]; then
echo "Executing post_upgrade.sh file..." echo "Executing post upgrade file..."
chmod +x ${CWDIR}/post_upgrade.sh && ${CWDIR}/post_upgrade.sh chmod +x ${CWDIR}/post_upgrade.sh && ${CWDIR}/post_upgrade.sh
sleep 3 sleep 3
else
echo "No post upgrade changes pending."
fi fi
sysrc -f ${CWDIR}${EXTCONF} EXTENSION_UPGRADED="0" >/dev/null 2>&1 sysrc -f ${CWDIR}${EXTCONF} EXTENSION_UPGRADED="0" >/dev/null 2>&1
fi fi

5
gui/bastille_manager_maintenance.php
View File

@@ -90,6 +90,9 @@ if ($_POST) {
$ausgabe = ob_get_contents(); $ausgabe = ob_get_contents();
ob_end_clean(); ob_end_clean();
$savemsg .= str_replace("\n", "<br />", $ausgabe)."<br />"; $savemsg .= str_replace("\n", "<br />", $ausgabe)."<br />";
// Silently execute bastille-init post upgrade for pending changes.
// This is to make sure that minor changes are always applied.
exec('bastille-init');
else: else:
$input_errors[] = gtext('An error has occurred during upgrade process.'); $input_errors[] = gtext('An error has occurred during upgrade process.');
$cmd = sprintf('echo %s: %s An error has occurred during upgrade process. >> %s',$date,$application,$logfile); $cmd = sprintf('echo %s: %s An error has occurred during upgrade process. >> %s',$date,$application,$logfile);
@@ -243,8 +246,6 @@ if ($_POST) {
$savemsg .= gtext("ZFS activation option has been skipped."); $savemsg .= gtext("ZFS activation option has been skipped.");
endif; endif;
endif; endif;
# Run bastille-init to update config.
exec("bastille-init");
} }
if (isset($_POST['restore']) && $_POST['restore']) { if (isset($_POST['restore']) && $_POST['restore']) {

2
version
View File

@@ -1 +1 @@
1.2.21 1.2.22