| Message ID | 20240712081143.1376952-5-stefan-koch@siemens.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | initramfs-crypt-hook: Speedup disk-encryption reencrypt and other improvements | expand |
This does not explain what the impact of the missing executable was so far - or why it was not missed? And if it is a real fix, it should come first. Jan On 12.07.24 10:11, Stefan Koch wrote: > Signed-off-by: Stefan Koch <stefan-koch@siemens.com> > --- > .../initramfs-crypt-hook/files/encrypt_partition.clevis.hook | 1 + > .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook | 1 + > .../initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb | 2 +- > 3 files changed, 3 insertions(+), 1 deletion(-) > > 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 4e62ef7..275461d 100755 > --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook > +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook > @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found" > copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" > copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" > copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" > +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found" > copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found" > copy_exec /usr/sbin/resize2fs || hook_error "/usr/sbin/resize2fs not found" > copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup not found" > 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 2ace533..4aa3e91 100755 > --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook > +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook > @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found" > copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" > copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" > copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" > +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found" > copy_exec /usr/bin/seq || hook_error "/usr/bin/seq not found" > copy_exec /usr/bin/sleep || hook_error "/usr/bin/sleep not found" > copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found" > diff --git a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb > index 76ce72c..1364248 100644 > --- a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb > +++ b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb > @@ -12,7 +12,7 @@ inherit dpkg-raw > DEBIAN_DEPENDS = "initramfs-tools, mount, cryptsetup, \ > awk, openssl, libtss2-esys-3.0.2-0 | libtss2-esys0, \ > libtss2-rc0 | libtss2-esys0, libtss2-mu0 | libtss2-esys0, \ > - e2fsprogs, tpm2-tools, coreutils, uuid-runtime" > + e2fsprogs, tpm2-tools, coreutils, util-linux, uuid-runtime" > > CLEVIS_DEPEND = ", clevis-luks, jose, bash, luksmeta, file, libpwquality-tools" >
On Fri, 2024-07-12 at 11:30 +0200, Jan Kiszka wrote: > This does not explain what the impact of the missing executable was > so > far - or why it was not missed? And if it is a real fix, it should > come > first. Ok, too late. It's already fixed by 95e952569b59602dd05f4138de9602a5b0398f0a "fix: Add missing mountpoint to crypthook" > > Jan > > On 12.07.24 10:11, Stefan Koch wrote: > > Signed-off-by: Stefan Koch <stefan-koch@siemens.com> > > --- > > .../initramfs-crypt-hook/files/encrypt_partition.clevis.hook | > > 1 + > > .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook | > > 1 + > > .../initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb | > > 2 +- > > 3 files changed, 3 insertions(+), 1 deletion(-) > > > > 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 4e62ef7..275461d 100755 > > --- a/recipes-initramfs/initramfs-crypt- > > hook/files/encrypt_partition.clevis.hook > > +++ b/recipes-initramfs/initramfs-crypt- > > hook/files/encrypt_partition.clevis.hook > > @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error > > "/usr/sbin/mke2fs not found" > > copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" > > copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" > > copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" > > +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint > > not found" > > copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not > > found" > > copy_exec /usr/sbin/resize2fs || hook_error "/usr/sbin/resize2fs > > not found" > > copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup > > not found" > > 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 2ace533..4aa3e91 100755 > > --- a/recipes-initramfs/initramfs-crypt- > > hook/files/encrypt_partition.systemd.hook > > +++ b/recipes-initramfs/initramfs-crypt- > > hook/files/encrypt_partition.systemd.hook > > @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error > > "/usr/sbin/mke2fs not found" > > copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" > > copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" > > copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" > > +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint > > not found" > > copy_exec /usr/bin/seq || hook_error "/usr/bin/seq not found" > > copy_exec /usr/bin/sleep || hook_error "/usr/bin/sleep not found" > > copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not > > found" > > diff --git a/recipes-initramfs/initramfs-crypt-hook/initramfs- > > crypt-hook_0.2.bb b/recipes-initramfs/initramfs-crypt- > > hook/initramfs-crypt-hook_0.2.bb > > index 76ce72c..1364248 100644 > > --- a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt- > > hook_0.2.bb > > +++ b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt- > > hook_0.2.bb > > @@ -12,7 +12,7 @@ inherit dpkg-raw > > DEBIAN_DEPENDS = "initramfs-tools, mount, cryptsetup, \ > > awk, openssl, libtss2-esys-3.0.2-0 | libtss2-esys0, \ > > libtss2-rc0 | libtss2-esys0, libtss2-mu0 | libtss2-esys0, \ > > - e2fsprogs, tpm2-tools, coreutils, uuid-runtime" > > + e2fsprogs, tpm2-tools, coreutils, util-linux, uuid-runtime" > > > > CLEVIS_DEPEND = ", clevis-luks, jose, bash, luksmeta, file, > > libpwquality-tools" > > >
On 12.07.24 12:05, Koch, Stefan (DI PA DCP R&D 3) wrote: > On Fri, 2024-07-12 at 11:30 +0200, Jan Kiszka wrote: >> This does not explain what the impact of the missing executable was >> so >> far - or why it was not missed? And if it is a real fix, it should >> come >> first. > Ok, too late. It's already fixed by > 95e952569b59602dd05f4138de9602a5b0398f0a "fix: Add missing mountpoint > to crypthook" Err, that was fixed in May - you didn't rebase and test over current next before sending...? Jan
On Fri, 2024-07-12 at 12:07 +0200, Jan Kiszka wrote: > On 12.07.24 12:05, Koch, Stefan (DI PA DCP R&D 3) wrote: > > On Fri, 2024-07-12 at 11:30 +0200, Jan Kiszka wrote: > > > This does not explain what the impact of the missing executable > > > was > > > so > > > far - or why it was not missed? And if it is a real fix, it > > > should > > > come > > > first. > > Ok, too late. It's already fixed by > > 95e952569b59602dd05f4138de9602a5b0398f0a "fix: Add missing > > mountpoint > > to crypthook" > > Err, that was fixed in May - you didn't rebase and test over current > next before sending...? Not good, bot it just runs even with double copy of mountpoint.. > > Jan >
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 4e62ef7..275461d 100755 --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.clevis.hook @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found" copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found" copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found" copy_exec /usr/sbin/resize2fs || hook_error "/usr/sbin/resize2fs not found" copy_exec /usr/sbin/cryptsetup || hook_error "/usr/sbin/cryptsetup not found" 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 2ace533..4aa3e91 100755 --- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook +++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.systemd.hook @@ -45,6 +45,7 @@ copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found" copy_exec /usr/bin/grep || hook_error "/usr/bin/grep not found" copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found" copy_exec /usr/bin/expr || hook_error "/usr/bin/expr not found" +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found" copy_exec /usr/bin/seq || hook_error "/usr/bin/seq not found" copy_exec /usr/bin/sleep || hook_error "/usr/bin/sleep not found" copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found" diff --git a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb index 76ce72c..1364248 100644 --- a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb +++ b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb @@ -12,7 +12,7 @@ inherit dpkg-raw DEBIAN_DEPENDS = "initramfs-tools, mount, cryptsetup, \ awk, openssl, libtss2-esys-3.0.2-0 | libtss2-esys0, \ libtss2-rc0 | libtss2-esys0, libtss2-mu0 | libtss2-esys0, \ - e2fsprogs, tpm2-tools, coreutils, uuid-runtime" + e2fsprogs, tpm2-tools, coreutils, util-linux, uuid-runtime" CLEVIS_DEPEND = ", clevis-luks, jose, bash, luksmeta, file, libpwquality-tools"
Signed-off-by: Stefan Koch <stefan-koch@siemens.com> --- .../initramfs-crypt-hook/files/encrypt_partition.clevis.hook | 1 + .../initramfs-crypt-hook/files/encrypt_partition.systemd.hook | 1 + .../initramfs-crypt-hook/initramfs-crypt-hook_0.2.bb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)