mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-20 05:28:08 +00:00
oem-factory-reset: Offer to use all defaults on Librem boards only
Introduce CONFIG_OEMRESET_OFFER_DEFAULTS and enable it on Librem boards. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
parent
f6134e9c35
commit
8289d1bb29
@ -31,6 +31,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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -31,6 +31,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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -29,6 +29,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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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=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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -31,6 +31,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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -29,6 +29,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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -33,6 +33,7 @@ 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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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=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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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_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_TOTP_SKIP_QRCODE=y
|
||||||
|
export CONFIG_OEMRESET_OFFER_DEFAULTS=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
|
||||||
|
@ -392,8 +392,11 @@ fi
|
|||||||
# We show current integrity measurements status and time
|
# We show current integrity measurements status and time
|
||||||
report_integrity_measurements
|
report_integrity_measurements
|
||||||
|
|
||||||
echo -e -n "Would you like to use default configuration options?\nIf N, you will be prompted for each option [Y/n]: "
|
use_defaults=n
|
||||||
read -n 1 use_defaults
|
if [ "$CONFIG_OEMRESET_OFFER_DEFAULTS" = y ]; then
|
||||||
|
echo -e -n "Would you like to use default configuration options?\nIf N, you will be prompted for each option [Y/n]: "
|
||||||
|
read -n 1 use_defaults
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$use_defaults" == "n" -o "$use_defaults" == "N" ]; then
|
if [ "$use_defaults" == "n" -o "$use_defaults" == "N" ]; then
|
||||||
# Re-ownership of encrypted disk key, content and passphrase
|
# Re-ownership of encrypted disk key, content and passphrase
|
||||||
|
Loading…
Reference in New Issue
Block a user