Merge pull request #682 from MrChromebox/clean_boot_detect_fix

gui-init: fix checking librem key card-status
This commit is contained in:
tlaurion 2020-02-19 17:57:46 -05:00 committed by GitHub
commit e5c7f7397f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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