ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-20 05:28:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #677 from MrChromebox/usb_keyboard

Browse Source 
init: load usb modules for devices using USB keyboard
gui-init: remove enable_usb to fix generic Heads users who wanted to release LUKS disk encryption key from TPM if measurements were valid (fix regression)
This commit is contained in:
tlaurion 2020-02-19 12:54:26 -05:00 committed by GitHub
commit 8e23a54f28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
initrd/bin/gui-init
View File

@ -128,9 +128,6 @@ clean_boot_check()
"Clean Boot Detected - Perform OEM Factory Reset?" "$CONFIG_WARNING_BG_COLOR" "Clean Boot Detected - Perform OEM Factory Reset?" "$CONFIG_WARNING_BG_COLOR"
} }
# enable USB to load modules for external kb
enable_usb
if detect_boot_device ; then if detect_boot_device ; then
# /boot device with installed OS found # /boot device with installed OS found
clean_boot_check clean_boot_check

5
initrd/init
View File

@ -64,6 +64,11 @@ if [ ! -z "$CONFIG_BOOT_RECOVERY_SERIAL" ]; then
> "$CONFIG_BOOT_RECOVERY_SERIAL" 2>&1 & > "$CONFIG_BOOT_RECOVERY_SERIAL" 2>&1 &
fi fi
# load USB modules for boards using a USB keyboard
if [ "$CONFIG_USB_KEYBOARD" = "y" ]; then
enable_usb
fi
# If the user has been holding down r, enter a recovery shell # If the user has been holding down r, enter a recovery shell
# otherwise immediately start the configured boot script. # otherwise immediately start the configured boot script.
# We don't print a prompt, since this is a near instant timeout. # We don't print a prompt, since this is a near instant timeout.