diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:38:46 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:38:46 +0000 |
| commit | 6dbe38986e3963a8d21173d443d1a32e089e5876 (patch) | |
| tree | 72dffc1c33f57ca55d333bba6baa02cd3f39836c /debian/initramfs/hooks | |
| parent | Merging upstream version 2:2.7.2. (diff) | |
| download | cryptsetup-6dbe38986e3963a8d21173d443d1a32e089e5876.tar.xz cryptsetup-6dbe38986e3963a8d21173d443d1a32e089e5876.zip | |
Merging debian version 2:2.7.2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/initramfs/hooks')
| -rw-r--r-- | debian/initramfs/hooks/cryptroot | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/debian/initramfs/hooks/cryptroot b/debian/initramfs/hooks/cryptroot index 83d29fd..dd5c798 100644 --- a/debian/initramfs/hooks/cryptroot +++ b/debian/initramfs/hooks/cryptroot @@ -313,27 +313,6 @@ copy_libssl_legacy_library() { fi } -# See #1032221: newer libargon2 are built with glibc ≥2.34 hence no -# longer links libpthread. This in turns means that initramfs-tool's -# copy_exec() is no longer able to detect pthread_*() need and thus -# doesn't copy libgcc_s.so anymore. So we need to do it manually -# instead. -copy_libgcc_argon2() { - local libdir rv=0 - libdir="$(env --unset=LD_PRELOAD ldd /sbin/cryptsetup | sed -nr '/.*=>\s*(\S+)\/libargon2\.so\..*/ {s//\1/p;q}')" - copy_libgcc "$libdir" || rv=$? - if [ $rv -ne 0 ]; then - # merged-/usr mismatch, see #1032518 - if [ "${libdir#/usr/}" != "$libdir" ]; then - libdir="${libdir#/usr}" - else - libdir="/usr/${libdir#/}" - fi - copy_libgcc "$libdir" && rv=0 || rv=$? - fi - return $rv -} - ####################################################################### # Begin real processing @@ -370,7 +349,6 @@ manual_add_modules dm_crypt copy_exec /sbin/cryptsetup copy_exec /sbin/dmsetup -copy_libgcc_argon2 [ "$ASKPASS" = n ] || copy_exec /lib/cryptsetup/askpass |