Skip to content

Commit e33af25

Browse files
committed
initrd/bin/kexec-save-default: remove mount-usb --mode rw and dmesg.txt output to usb thumb drive
Really handy btw. Would be nice to add that into sysrq magic to output to usb thumb drive and have ctrl-alt-delete output dmesg to external storage when in debug mode. Would work also for headless debug when porting TODO: squash allrelated commits together. Signed-off-by: Thierry Laurion <[email protected]>
1 parent 30e52ef commit e33af25

File tree

3 files changed

+1
-32
lines changed

3 files changed

+1
-32
lines changed

initrd/bin/kexec-save-default

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,6 @@ if [ "$CONFIG_TPM" = "y" ] && [ "$CONFIG_TPM_NO_LUKS_DISK_UNLOCK" != "y" ] && [
280280
save_key_params+=("${key_devices[*]}")
281281
fi
282282
283-
#TODO REMOVE THIS TROUBLESHOOTING HACK
284-
DEBUG "Outputting logs to USB drive. Please wait..."
285-
mount-usb --mode rw
286-
dmesg >/media/dmesg.txt
287-
DEBUG "Done. You can CTRL-Alt-Delete now to reboot, files will be synced to USB drive before rebooting"
288-
289283
kexec-save-key "${save_key_params[@]}" ||
290284
die "Failed to save the TPM Disk Unlock Key"
291285
fi

initrd/bin/kexec-seal-key

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ for dev in $(cat "$KEY_DEVICES" | cut -d\ -f1); do
117117
$dev 1 ||
118118
warn "$dev: removal of TPM Disk Unlock Key in LUKS slot 1 failed: might not exist. Continuing"
119119

120-
echo "++++++ $dev: Adding TPM DISK Unlock Key to LUKS slot 1"
120+
echo "++++++ $dev: Adding TPM Disk Unlock Key to LUKS slot 1"
121121
cryptsetup luksAddKey \
122122
--key-file "$RECOVERY_KEY" \
123123
--key-slot 1 \

prompt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)