mirror of
https://github.com/linuxboot/heads.git
synced 2025-01-18 02:39:59 +00:00
gui-init: Opt into skipping QR code scan for Librem boards only
Introduce CONFIG_TOTP_SKIP_QRCODE to skip this step and enable it on Librem boards. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
parent
71243c1a13
commit
f6134e9c35
@ -30,6 +30,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
export CONFIG_BOOT_REQ_ROLLBACK=n
|
export CONFIG_BOOT_REQ_ROLLBACK=n
|
||||||
|
@ -30,6 +30,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
export CONFIG_BOOT_REQ_ROLLBACK=n
|
export CONFIG_BOOT_REQ_ROLLBACK=n
|
||||||
|
@ -28,6 +28,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
|
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
|
@ -30,6 +30,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
export CONFIG_BOOT_REQ_ROLLBACK=n
|
export CONFIG_BOOT_REQ_ROLLBACK=n
|
||||||
|
@ -30,6 +30,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
export CONFIG_BOOT_REQ_ROLLBACK=n
|
export CONFIG_BOOT_REQ_ROLLBACK=n
|
||||||
|
@ -28,6 +28,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=y
|
export CONFIG_TPM=y
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
|
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
|
@ -32,6 +32,7 @@ CONFIG_TPM2_TSS=y
|
|||||||
CONFIG_OPENSSL=y
|
CONFIG_OPENSSL=y
|
||||||
CONFIG_PRIMARY_KEY_TYPE=ecc
|
CONFIG_PRIMARY_KEY_TYPE=ecc
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
|
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
|
@ -29,6 +29,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=n
|
export CONFIG_TPM=n
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
|
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
|
@ -31,6 +31,7 @@ CONFIG_LINUX_USB=y
|
|||||||
|
|
||||||
export CONFIG_TPM=n
|
export CONFIG_TPM=n
|
||||||
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=y
|
||||||
|
export CONFIG_TOTP_SKIP_QRCODE=y
|
||||||
|
|
||||||
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
export CONFIG_BOOTSCRIPT=/bin/gui-init
|
||||||
export CONFIG_BOOT_REQ_HASH=n
|
export CONFIG_BOOT_REQ_HASH=n
|
||||||
|
@ -159,7 +159,16 @@ generate_totp_hotp()
|
|||||||
elif echo -e "Generating new TOTP secret...\n\n" && /bin/seal-totp "$BOARD_NAME" "$tpm_password"; then
|
elif echo -e "Generating new TOTP secret...\n\n" && /bin/seal-totp "$BOARD_NAME" "$tpm_password"; then
|
||||||
echo
|
echo
|
||||||
if [ -x /bin/hotp_verification ]; then
|
if [ -x /bin/hotp_verification ]; then
|
||||||
|
if [ "$CONFIG_TOTP_SKIP_QRCODE" != y ]; then
|
||||||
|
echo "Once you have scanned the QR code, hit Enter to configure your HOTP USB Security Dongle (e.g. Librem Key or Nitrokey)"
|
||||||
|
read
|
||||||
|
fi
|
||||||
/bin/seal-hotpkey
|
/bin/seal-hotpkey
|
||||||
|
else
|
||||||
|
if [ "$CONFIG_TOTP_SKIP_QRCODE" != y ]; then
|
||||||
|
echo "Once you have scanned the QR code, hit Enter to continue"
|
||||||
|
read
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
# clear screen
|
# clear screen
|
||||||
printf "\033c"
|
printf "\033c"
|
||||||
|
Loading…
Reference in New Issue
Block a user