From 961ac698a4170f2bbfe1aa7bb31f519fe7175200 Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Wed, 13 May 2026 09:47:43 +0200
Subject: [PATCH] bootgrid: align datakey with the rest of the options, but
 allow top-level placement

(cherry picked from commit 1fe9b82f7879b2ed92fee135fab1470e9cdafe41)
---
 src/opnsense/www/js/opnsense_bootgrid.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/www/js/opnsense_bootgrid.js b/src/opnsense/www/js/opnsense_bootgrid.js
index 3d5b254ca1..9c28adcf7a 100644
--- a/src/opnsense/www/js/opnsense_bootgrid.js
+++ b/src/opnsense/www/js/opnsense_bootgrid.js
@@ -321,9 +321,10 @@ class UIBootgrid {
             }
         }
 
-        if (compatOptions?.datakey) {
-            // note: this does not come from the 'options' object
-            this.options.datakey = compatOptions?.datakey;
+        const datakey = compatOptions?.datakey || bootGridOptions?.datakey;
+        if (datakey) {
+            // datakey can come from top-level object for legacy reasons
+            this.options.datakey = datakey;
         }
 
         if (bootGridOptions?.onBeforeRenderDialog) {