Merge pull request #1130 from marmarek/early-usb

Check for /bin/hotp_verification instead of CONFIG_HOTPKEY
This commit is contained in:
tlaurion 2022-03-03 18:59:04 -05:00 committed by GitHub
commit 70b93be782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -249,7 +249,7 @@ 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 [ "$CONFIG_HOTPKEY" = "y" ]; then if [ -x /bin/hotp_verification ]; then
if ! gpg --card-status > /dev/null ; then if ! gpg --card-status > /dev/null ; then
return return
fi fi
@ -541,7 +541,7 @@ else
HOTPKEY_BRANDING="HOTP USB Security Dongle" HOTPKEY_BRANDING="HOTP USB Security Dongle"
fi fi
if [ "$CONFIG_HOTPKEY" = "y" ]; then if [ -x /bin/hotp_verification ]; then
enable_usb enable_usb
fi fi