2023-02-08 21:01:48 +00:00
|
|
|
#!/bin/bash
|
2017-07-03 03:01:04 +00:00
|
|
|
# Boot a USB installation
|
2017-04-29 17:40:34 +00:00
|
|
|
|
|
|
|
. /etc/functions
|
2018-12-06 23:24:28 +00:00
|
|
|
. /tmp/config
|
2017-04-29 17:40:34 +00:00
|
|
|
|
2023-02-20 16:01:17 +00:00
|
|
|
TRACE "Under /bin/usb-init"
|
2023-02-18 17:58:43 +00:00
|
|
|
|
tpm2-tools: Change sense of CONFIG_TPM to mean any TPM, not just TPM1.
Most logic throughout Heads doesn't need to know TPM1 versus TPM2 (and
shouldn't, the differences should be localized). Some checks were
incorrect and are fixed by this change. Most checks are now unchanged
relative to master.
There are not that many places outside of tpmr that need to
differentiate TPM1 and TPM2. Some of those are duplicate code that
should be consolidated (seal-hotpkey, unseal-totp, unseal-hotp), and
some more are probably good candidates for abstracting in tpmr so the
business logic doesn't have to know TPM1 vs. TPM2.
Previously, CONFIG_TPM could be variously 'y', 'n', or empty. Now it
is always 'y' or 'n', and 'y' means "any TPM". Board configs are
unchanged, setting CONFIG_TPM2_TOOLS=y implies CONFIG_TPM=y so this
doesn't have to be duplicated and can't be mistakenly mismatched.
There were a few checks for CONFIG_TPM = n that only coincidentally
worked for TPM2 because CONFIG_TPM was empty (not 'n'). This test is
now OK, but the checks were also cleaned up to '!= "y"' for robustness.
Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
2023-02-22 21:30:07 +00:00
|
|
|
if [ "$CONFIG_TPM" = "y" ]; then
|
2017-12-05 08:29:07 +00:00
|
|
|
# Extend PCR4 as soon as possible
|
2022-08-25 18:43:31 +00:00
|
|
|
tpmr extend -ix 4 -ic usb
|
2017-12-05 08:29:07 +00:00
|
|
|
fi
|
2017-04-29 17:40:34 +00:00
|
|
|
|
2023-01-26 20:03:03 +00:00
|
|
|
media-scan usb
|
2017-07-08 20:59:37 +00:00
|
|
|
recovery "Something failed during USB boot"
|