Merge pull request #23653 from aafeijoo-suse/ask-for-recovery-key

author Lennart Poettering <lennart@poettering.net>

Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)

committer GitHub <noreply@github.com>

Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)
committer GitHub <noreply@github.com>
Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)
diff --cc TODO
Simple merge
diff --cc src/cryptsetup/cryptsetup.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)
committer	GitHub <noreply@github.com>
	Fri, 19 Aug 2022 12:55:54 +0000 (14:55 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/cryptsetup/cryptsetup.c	patch \|	diff1 \|	diff2 \|	blob \| history