From 57b487c38cbc014bbe2e3d6a477b9a5651967b46 Mon Sep 17 00:00:00 2001 From: Kyle Rankin Date: Wed, 5 Dec 2018 14:51:53 -0800 Subject: [PATCH] Update version #s for Librem coreboot, add Librem Key detection dialog The Librem coreboot is labeled with the current version and is visible from dmidecode and is supposed to reflect the current version of coreboot, however it was out of date and reflected 4.7 when Heads has moved on to 4.8.1. I've also added a simple change to further simplify onboarding by warning users who have Librem Key configured when they boot without it being inserted. --- config/coreboot-librem13v2.config | 4 ++-- config/coreboot-librem15v3.config | 4 ++-- initrd/bin/gui-init | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/coreboot-librem13v2.config b/config/coreboot-librem13v2.config index f05c1d12..fad72db6 100644 --- a/config/coreboot-librem13v2.config +++ b/config/coreboot-librem13v2.config @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="4.7-Purism-4-heads" +CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta" CONFIG_USE_BLOBS=y CONFIG_MEASURED_BOOT=y CONFIG_VENDOR_PURISM=y @@ -26,7 +26,7 @@ CONFIG_FSP_M_XIP=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=on iommu=pt" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=on iommu=pt quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz" CONFIG_COREINFO_SECONDARY_PAYLOAD=y CONFIG_MEMTEST_SECONDARY_PAYLOAD=y diff --git a/config/coreboot-librem15v3.config b/config/coreboot-librem15v3.config index 53d196b5..218ea5f7 100644 --- a/config/coreboot-librem15v3.config +++ b/config/coreboot-librem15v3.config @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="4.7-Purism-4-heads" +CONFIG_LOCALVERSION="4.8.1-Purism-1-heads-beta" CONFIG_USE_BLOBS=y CONFIG_MEASURED_BOOT=y CONFIG_VENDOR_PURISM=y @@ -26,7 +26,7 @@ CONFIG_FSP_M_XIP=y CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=on iommu=pt" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=on iommu=pt quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz" CONFIG_COREINFO_SECONDARY_PAYLOAD=y CONFIG_MEMTEST_SECONDARY_PAYLOAD=y diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init index 35b32fad..692c382d 100755 --- a/initrd/bin/gui-init +++ b/initrd/bin/gui-init @@ -149,6 +149,9 @@ while true; do if [ -x /bin/libremkey_hotp_verification ]; then HOTP=`unseal-hotp` enable_usb + if ! libremkey_hotp_verification info ; then + whiptail $CONFIG_WARNING_BG_COLOR --clear --title 'WARNING: Please Insert Your Librem Key' --msgbox "Your Librem Key was not detected.\n\nPlease insert your Librem Key" 30 90 + fi # Don't output HOTP codes to screen, so as to make replay attacks harder libremkey_hotp_verification check $HOTP case "$?" in