From a55b4c8b22f175e7870c337dfa4de80e52c035ec Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 2 Nov 2023 09:39:20 +0100
Subject: [PATCH] firmware: invalidate caches earlier since certctl blocks this
 longer now

---
 src/etc/rc.configure_firmware | 8 ++++----
 src/etc/rc.configure_plugins  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etc/rc.configure_firmware b/src/etc/rc.configure_firmware
index 6395c6ed9..8a8af0df2 100755
--- a/src/etc/rc.configure_firmware
+++ b/src/etc/rc.configure_firmware
@@ -44,12 +44,12 @@ require_once 'system.inc';
 /* upgrade config before doing anything else */
 convert_config(true);
 
+/* flush user-facing caches */
+(new OPNsense\Core\ACL())->invalidateCache();
+(new OPNsense\Base\Menu\MenuSystem())->invalidateCache();
+
 /* reload subsystem that may have changed */
 system_firmware_configure(true);
 system_trust_configure(true);
 system_login_configure(true);
 system_syslog_start(true);
-
-/* flush user-facing caches */
-(new OPNsense\Core\ACL())->invalidateCache();
-(new OPNsense\Base\Menu\MenuSystem())->invalidateCache();
diff --git a/src/etc/rc.configure_plugins b/src/etc/rc.configure_plugins
index 41e91055d..b195fd5cc 100755
--- a/src/etc/rc.configure_plugins
+++ b/src/etc/rc.configure_plugins
@@ -40,11 +40,11 @@ require_once 'util.inc';
 /* assume standard operation mode as post-install */
 $script = !empty($argv[1]) ? $argv[1] : 'POST_INSTALL';
 
+/* flush user-facing caches */
+(new OPNsense\Core\ACL())->invalidateCache();
+(new OPNsense\Base\Menu\MenuSystem())->invalidateCache();
+
 /* reload subsystem that may have changed */
 if ($script == 'POST_INSTALL') {
     system_syslog_start(true);
 }
-
-/* flush user-facing caches */
-(new OPNsense\Core\ACL())->invalidateCache();
-(new OPNsense\Base\Menu\MenuSystem())->invalidateCache();