Skip to content

Commit 699a1a7

Browse files
committed
Remove DO_WITH_DEBUG from increment_tpm_counter calls
DO_WITH_DEBUG redirects stdout/stderr through tee for logging, which breaks interactive password prompts by interfering with TTY access. Both increment_tpm_counter calls already redirect output to /dev/null, so DO_WITH_DEBUG provided no logging benefit while breaking prompts. This allows TPM owner password prompts to display correctly on console when TPM counters need to be created or incremented. Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent de7e630 commit 699a1a7

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

initrd/bin/gui-init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ reset_tpm() {
566566
DEBUG "TPM_COUNTER: $TPM_COUNTER"
567567
#TPM_COUNTER can be empty
568568

569-
DO_WITH_DEBUG increment_tpm_counter $TPM_COUNTER>/dev/null 2>&1 ||
569+
increment_tpm_counter $TPM_COUNTER>/dev/null 2>&1 ||
570570
die "Unable to increment tpm counter"
571571

572572
DO_WITH_DEBUG sha256sum /tmp/counter-$TPM_COUNTER >/boot/kexec_rollback.txt ||

initrd/bin/kexec-sign-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if [ "$rollback" = "y" ]; then
9494

9595
# Increment the TPM counter
9696
DEBUG "rollback=y: Incrementing counter $TPM_COUNTER."
97-
DO_WITH_DEBUG increment_tpm_counter $TPM_COUNTER >/dev/null 2>&1 ||
97+
increment_tpm_counter $TPM_COUNTER >/dev/null 2>&1 ||
9898
die "$paramsdir: Unable to increment tpm counter"
9999

100100
# Ensure the incremented counter file exists

0 commit comments

Comments
 (0)