From a57180946bbf1e4d68d7d03dcf79240f05586d21 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 15 Jan 2026 08:34:20 +0100
Subject: [PATCH] firmware: hook plugin install, third time is the charm?

---
 src/etc/rc.restart_webgui                          | 3 +++
 src/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index e7539d7a87..e48f90f858 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -7,6 +7,9 @@ require_once('util.inc');
 require_once('system.inc');
 require_once('plugins.inc.d/webgui.inc');
 
+/* XXX hook for the development version only */
+pass_safe('/usr/local/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh devel');
+
 if (count($argv) > 1) {
     if (is_numeric($argv[1])) {
         /* starting delayed */
diff --git a/src/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh b/src/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh
index 2e9966b136..afe23d9736 100755
--- a/src/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh
+++ b/src/etc/rc.syshook.d/upgrade/20-isc-dhcp-plugin.sh
@@ -23,9 +23,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+WHICHONE=os-isc-dhcp
+
+if [ "${1}" == "devel" ]; then
+	WHICHONE=${WHICHONE}-${1}
+fi
+
 if [ ! -f /usr/local/opnsense/version/isc-dhcp ]; then
 	echo "Installing legacy ISC-DHCP plugin for compatibility..."
-	/usr/local/opnsense/scripts/firmware/launcher.sh -u install os-isc-dhcp
+	/usr/local/opnsense/scripts/firmware/launcher.sh -u install ${WHICHONE}
 else
 	echo "Skipping already installed legacy ISC-DHCP plugin..."
 fi