From 64484206ed950b51eed77b74dc491733e97f9443 Mon Sep 17 00:00:00 2001
From: Kyle Rankin <kyle.rankin@puri.sm>
Date: Thu, 6 Dec 2018 16:27:36 -0800
Subject: [PATCH] Load cbfs before combining configs and building fstab

---
 initrd/init | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/initrd/init b/initrd/init
index 4410c6fb..4b4eefb2 100755
--- a/initrd/init
+++ b/initrd/init
@@ -40,6 +40,15 @@ hwclock -l -s
 
 # Read the system configuration parameters
 . /etc/functions
+. /etc/config
+
+if [ "$CONFIG_COREBOOT" = "y" ]; then
+	/bin/cbfs-init
+fi
+if [ "$CONFIG_LINUXBOOT" = "y" ]; then
+	/bin/uefi-init
+fi
+
 combine_configs
 . /tmp/config
 
@@ -52,12 +61,6 @@ if [ ! -z "$CONFIG_USB_BOOT_DEV" ]; then
 	echo >> /etc/fstab "$CONFIG_USB_BOOT_DEV /media auto defaults,ro 0 0"
 fi
 
-if [ "$CONFIG_COREBOOT" = "y" ]; then
-	/bin/cbfs-init
-fi
-if [ "$CONFIG_LINUXBOOT" = "y" ]; then
-	/bin/uefi-init
-fi
 /bin/key-init
 
 # Setup recovery serial shell