diff mbox series

[isar-cip-core,4/4] initramfs-crypt-hook: Fix error with libcryptsetup-token-systemd-tpm2.so

Message ID 20230728143320.3891194-5-stefan-koch@siemens.com (mailing list archive)
State Rejected
Headers show
Series initramfs-crypt-hook: Fix disk encryption | expand

Commit Message

Stefan Koch July 28, 2023, 2:33 p.m. UTC
The library is missing and is not needed for systemd from bullseye-backports.

Signed-off-by: Stefan Koch <stefan-koch@siemens.com>
---
 .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jan Kiszka Aug. 10, 2023, 10:39 a.m. UTC | #1
On 28.07.23 16:33, Koch, Stefan (DI PA DCP R&D 3) wrote:
> The library is missing and is not needed for systemd from bullseye-backports.
> 
> Signed-off-by: Stefan Koch <stefan-koch@siemens.com>
> ---
>  .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook   | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
> index 08ea631..dac60e0 100755
> --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
> +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
> @@ -44,7 +44,7 @@ copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup not found"
>  copy_exec /usr/bin/systemd-cryptenroll || hook_error "/usr/bin/systemd-cryptenroll not found"
>  copy_exec /usr/lib/systemd/systemd-cryptsetup || hook_error "/usr/lib/systemd/systemd-cryptsetup not found"
>  
> -copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || hook_error "/usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so not found"
> +copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || true
>  if [ -x /usr/sbin/cryptsetup-reencrypt ]; then
>      copy_exec /usr/sbin/cryptsetup-reencrypt
>  fi

This recipe is not to be used by bullseye because we decided - for good
reasons - against using systemd from backports for <bookworm.

Jan
Quirin Gylstorff Aug. 10, 2023, 11:20 a.m. UTC | #2
On 8/10/23 12:39, Jan Kiszka via lists.cip-project.org wrote:
> On 28.07.23 16:33, Koch, Stefan (DI PA DCP R&D 3) wrote:
>> The library is missing and is not needed for systemd from bullseye-backports.
>>
>> Signed-off-by: Stefan Koch <stefan-koch@siemens.com>
>> ---
>>   .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook   | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
>> index 08ea631..dac60e0 100755
>> --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
>> +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
>> @@ -44,7 +44,7 @@ copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup not found"
>>   copy_exec /usr/bin/systemd-cryptenroll || hook_error "/usr/bin/systemd-cryptenroll not found"
>>   copy_exec /usr/lib/systemd/systemd-cryptsetup || hook_error "/usr/lib/systemd/systemd-cryptsetup not found"
>>   
>> -copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || hook_error "/usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so not found"
>> +copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || true
>>   if [ -x /usr/sbin/cryptsetup-reencrypt ]; then
>>       copy_exec /usr/sbin/cryptsetup-reencrypt
>>   fi
> 
> This recipe is not to be used by bullseye because we decided - for good
> reasons - against using systemd from backports for <bookworm.

cip-core only supports clevis in bullseye.

Quirin
> 
> Jan
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#12592): https://lists.cip-project.org/g/cip-dev/message/12592
> Mute This Topic: https://lists.cip-project.org/mt/100411236/1753640
> Group Owner: cip-dev+owner@lists.cip-project.org
> Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [quirin.gylstorff@siemens.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
index 08ea631..dac60e0 100755
--- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
+++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
@@ -44,7 +44,7 @@  copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup not found"
 copy_exec /usr/bin/systemd-cryptenroll || hook_error "/usr/bin/systemd-cryptenroll not found"
 copy_exec /usr/lib/systemd/systemd-cryptsetup || hook_error "/usr/lib/systemd/systemd-cryptsetup not found"
 
-copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || hook_error "/usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so not found"
+copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || true
 if [ -x /usr/sbin/cryptsetup-reencrypt ]; then
     copy_exec /usr/sbin/cryptsetup-reencrypt
 fi