ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-01-31 00:24:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Load cbfs before combining configs and building fstab

Browse Source
This commit is contained in:
Kyle Rankin 2018-12-06 16:27:36 -08:00
parent 1e9491f98d
commit 64484206ed
No known key found for this signature in database
GPG Key ID: 555577116BFA74B9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
initrd/init
View File

@ -40,6 +40,15 @@ hwclock -l -s
# Read the system configuration parameters # Read the system configuration parameters
. /etc/functions . /etc/functions
. /etc/config
if [ "$CONFIG_COREBOOT" = "y" ]; then
/bin/cbfs-init
fi
if [ "$CONFIG_LINUXBOOT" = "y" ]; then
/bin/uefi-init
fi
combine_configs combine_configs
. /tmp/config . /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" echo >> /etc/fstab "$CONFIG_USB_BOOT_DEV /media auto defaults,ro 0 0"
fi fi
if [ "$CONFIG_COREBOOT" = "y" ]; then
/bin/cbfs-init
fi
if [ "$CONFIG_LINUXBOOT" = "y" ]; then
/bin/uefi-init
fi
/bin/key-init /bin/key-init
# Setup recovery serial shell # Setup recovery serial shell