From 92b18265377c8797914cadc20663beae90ccc667 Mon Sep 17 00:00:00 2001
From: alex-nitrokey <alex@nitrokey.com>
Date: Wed, 24 Jun 2020 17:36:53 +0200
Subject: [PATCH] /boot needs to get mounted first

---
 initrd/bin/gui-init | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init
index 71cdb79c..7e3be63d 100755
--- a/initrd/bin/gui-init
+++ b/initrd/bin/gui-init
@@ -3,12 +3,6 @@
 
 CONFIG_BOOT_GUI_MENU_NAME='Heads Boot Menu'
 
-if [ -r /boot/kexec_hotp_key ]; then
-	CONFIG_HOTPKEY_BRANDING="$(cat /boot/kexec_hotp_key)"
-else
-	CONFIG_HOTPKEY_BRANDING="HOTP USB security dongle"
-fi
-
 . /etc/functions
 . /tmp/config
 
@@ -146,6 +140,13 @@ else
   mount_boot
 fi
 
+# Use stored HOTP key branding
+if [ -r /boot/kexec_hotp_key ]; then
+	CONFIG_HOTPKEY_BRANDING="$(cat /boot/kexec_hotp_key)"
+else
+	CONFIG_HOTPKEY_BRANDING="HOTP USB Security Dongle"
+fi
+
 last_half=X
 while true; do
   MAIN_MENU_OPTIONS=""