diff mbox series

[isar-cip-core] fix: Add missing mountpoint to crypthook

Message ID 20240523120326.1702505-1-Quirin.Gylstorff@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] fix: Add missing mountpoint to crypthook | expand

Commit Message

Quirin Gylstorff May 23, 2024, 12:03 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

The crypthook requires `/usr/bin/mountpoint` to avoid the error:

 "mountpoint: not found"

 This was not found because other hooks already add the binary to
 the initramfs.

Reported-by: Wang, John <johnxw@amazon.com>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../initramfs-crypt-hook/files/encrypt_partition.clevis.hook     | 1 +
 .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook    | 1 +
 2 files changed, 2 insertions(+)

Comments

Jan Kiszka May 23, 2024, 2:14 p.m. UTC | #1 
On 23.05.24 14:03, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> The crypthook requires `/usr/bin/mountpoint` to avoid the error:
> 
>  "mountpoint: not found"
> 
>  This was not found because other hooks already add the binary to
>  the initramfs.
> 
> Reported-by: Wang, John <johnxw@amazon.com>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  .../initramfs-crypt-hook/files/encrypt_partition.clevis.hook     | 1 +
>  .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook    | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
> index 0644eab..4e62ef7 100755
> --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
> +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
> @@ -73,6 +73,7 @@ copy_exec /usr/bin/pwmake || hook_error "Unable to copy /usr/bin/pwmake"
>  copy_exec /usr/bin/file || hook_error "Unable to copy /usr/bin/file "
>  copy_exec /usr/lib/*/libgcc_s.so.1 || hook_error "Unable to copy /usr/lib/*/libgcc_s.so.1 "
>  copy_exec /usr/bin/uuidparse || hook_error "Unable to copy /usr/bin/uuidparse"
> +copy_exec /usr/bin/mountpoint || hook_error "Unable to copy /usr/bin/mountpoint"
>  
>  if [ -x /usr/sbin/cryptsetup-reencrypt ]; then
>      copy_exec /usr/sbin/cryptsetup-reencrypt
> 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 19e0fe4..be8c117 100755
> --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
> +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
> @@ -53,6 +53,7 @@ copy_exec /usr/bin/tpm2_pcrread || hook_error "Unable to copy /usr/bin/tpm2_pcrr
>  copy_exec /usr/bin/tpm2_testparms || hook_error "Unable to copy /usr/bin/tpm2_testparms"
>  copy_exec /usr/bin/basename || hook_error "Unable to copy /usr/bin/basename"
>  copy_exec /usr/bin/uuidparse || hook_error "Unable to copy /usr/bin/uuidparse"
> +copy_exec /usr/bin/mountpoint || hook_error "Unable to copy /usr/bin/mountpoint"
>  
>  copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || hook_error "/usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so not found"
>  if [ -x /usr/sbin/cryptsetup-reencrypt ]; then

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
index 0644eab..4e62ef7 100755
--- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
+++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook
@@ -73,6 +73,7 @@  copy_exec /usr/bin/pwmake || hook_error "Unable to copy /usr/bin/pwmake"
 copy_exec /usr/bin/file || hook_error "Unable to copy /usr/bin/file "
 copy_exec /usr/lib/*/libgcc_s.so.1 || hook_error "Unable to copy /usr/lib/*/libgcc_s.so.1 "
 copy_exec /usr/bin/uuidparse || hook_error "Unable to copy /usr/bin/uuidparse"
+copy_exec /usr/bin/mountpoint || hook_error "Unable to copy /usr/bin/mountpoint"
 
 if [ -x /usr/sbin/cryptsetup-reencrypt ]; then
     copy_exec /usr/sbin/cryptsetup-reencrypt
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 19e0fe4..be8c117 100755
--- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
+++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook
@@ -53,6 +53,7 @@  copy_exec /usr/bin/tpm2_pcrread || hook_error "Unable to copy /usr/bin/tpm2_pcrr
 copy_exec /usr/bin/tpm2_testparms || hook_error "Unable to copy /usr/bin/tpm2_testparms"
 copy_exec /usr/bin/basename || hook_error "Unable to copy /usr/bin/basename"
 copy_exec /usr/bin/uuidparse || hook_error "Unable to copy /usr/bin/uuidparse"
+copy_exec /usr/bin/mountpoint || hook_error "Unable to copy /usr/bin/mountpoint"
 
 copy_exec /usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so || hook_error "/usr/lib/*/cryptsetup/libcryptsetup-token-systemd-tpm2.so not found"
 if [ -x /usr/sbin/cryptsetup-reencrypt ]; then