From d70bc5a15b7502ca3281dc01c5cc2e0d2b598bc2 Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Sun, 14 Sep 2025 08:03:36 -0400
Subject: [PATCH] Added post upgrade function for convenience, cleanup

Added post upgrade function for convenience, cleanup obsolete code.
---
 CHANGELOG                            |  1 +
 bastille-init                        | 19 +++++++++++++++++++
 gui/bastille_manager_maintenance.php |  3 ---
 version                              |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 bastille-init

diff --git a/CHANGELOG b/CHANGELOG
index 00874e1..410762c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.2.03......Added post upgrade function for convenience, cleanup obsolete code.
 1.2.02......Always execute extension script after upgrade from WebGUI, code changes.
 1.2.01......Fix extension script missing statement preventing for new installs.
 1.2.00......Re-add Linux jail feature, WebGUI fixes and overall improvements.
diff --git a/bastille-init b/bastille-init
old mode 100755
new mode 100644
index 546c6bf..b0507e5
--- a/bastille-init
+++ b/bastille-init
@@ -332,6 +332,8 @@ extension_upgrade()
 				echo "*  WARNING: System reboot is required when upgrading from v${CURRENTVER_FULL} to v${UPDATEVER_FULL}     *"
 				echo "***********************************************************************************"
 			fi
+			# Tell the extension was upgraded. 
+			sysrc -f ${CWDIR}${EXTCONF} EXTENSION_UPGRADED="1" >/dev/null 2>&1
 		else
 			echo "Extension is on the latest version!"
 			rm -R ${CWDIR}/update
@@ -1197,6 +1199,22 @@ get_versions()
 	exit 0
 }
 
+post_upgrade()
+{
+	# Check/apply for required/pending updates/fixes if any.
+	# This file will be removed after success execution.
+	if sysrc -f ${CWDIR}${EXTCONF} -qc EXTENSION_UPGRADED=1; then	
+		if [ -f "${CWDIR}/post_upgrade.sh" ]; then
+			echo "Executing post_upgrade.sh file..."
+			${CWDIR}/post_upgrade.sh
+			sleep 5
+		else
+			echo "Nothing to do."
+		fi
+		sysrc -f ${CWDIR}${EXTCONF} EXTENSION_UPGRADED="0" >/dev/null 2>&1
+	fi
+}
+
 ext_start()
 {
 	if sysrc -f ${CWDIR}${EXTCONF} -qc LINUX_COMPAT_SUPPORT=YES; then
@@ -1221,6 +1239,7 @@ ext_start()
 	fi
 
 	if [ $? -eq 0 ]; then
+		post_upgrade
 		MSG="script has been started successfully!"
 		logger -t ${SCRIPTNAME} ${MSG}
 		exit 0
diff --git a/gui/bastille_manager_maintenance.php b/gui/bastille_manager_maintenance.php
index d441f56..d8748e5 100644
--- a/gui/bastille_manager_maintenance.php
+++ b/gui/bastille_manager_maintenance.php
@@ -85,9 +85,6 @@ if ($_POST) {
 		$output = [];
 		exec($cmd,$output,$return_val);
 		if($return_val == 0):
-			// Execute extension script after upgrade for convenience.
-			// This will cause the script to early trigger zfs config checks.
-			exec("{$rootfolder}/bastille-init");
 			ob_start();
 			include("{$logevent}");
 			$ausgabe = ob_get_contents();
diff --git a/version b/version
index 5ab1bb5..77ccbba 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.02
+1.2.03