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

gui-init: fix checking librem key card-status

Browse Source 
Commit 6b5adcca moved the call to enable_usb from gui-init
to init and guarded it with CONFIG_USB_KEYBOARD, but it was
missed that this is needed for the clean boot check logic
when a librem key is used. Add the call back to gui-init
and guard it properly

Test: clean_boot_detect works properly on a librem 13v4

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2020-02-19 16:27:57 -06:00
parent 8e23a54f28
commit 30b098bfac
No known key found for this signature in database
GPG Key ID: 2BBB776A35B978FD
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
initrd/bin/gui-init
View File

@ -118,8 +118,11 @@ clean_boot_check()
[ $GPG_KEY_COUNT -ne 0 ] && return [ $GPG_KEY_COUNT -ne 0 ] && return
# check for USB security token # check for USB security token
if ! gpg --card-status > /dev/null ; then if [ "$CONFIG_LIBREMKEY" = "y" ]; then
return enable_usb
if ! gpg --card-status > /dev/null ; then
return
fi
fi fi
# OS is installed, no kexec files present, no GPG keys in keyring, security token present # OS is installed, no kexec files present, no GPG keys in keyring, security token present