From 79ed6249ce3149eda1d895087c8665a41f6fb47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 4 Sep 2021 16:43:29 +0200 Subject: sys-boot/myinitramfs: revert changes As it seems the issue is somewhere else. The lock is now in /run/cryptsetup and /run is present. The code to include libgcc_s.so does not work as there are two more levels to include and the biggest issue is that it won't help anyway. I tested it by adding those files to filesystem and chrooting to it. The error was same. I even copied whole /usr and /lib and /lib64 and the error was same. This seems like there is something rotten deep. The root cause seems to be in the used algorithm. The default now is argon2 but when I use pbkdf2 the issue is gone. The issue seems to be with libargon2.so as it seems. --- sys-boot/myinitramfs/files/baselist | 2 -- sys-boot/myinitramfs/files/gen.sh | 7 ------- 2 files changed, 9 deletions(-) (limited to 'sys-boot/myinitramfs/files') diff --git a/sys-boot/myinitramfs/files/baselist b/sys-boot/myinitramfs/files/baselist index e176739..e1ad584 100644 --- a/sys-boot/myinitramfs/files/baselist +++ b/sys-boot/myinitramfs/files/baselist @@ -15,8 +15,6 @@ dir /usr/sbin 755 0 0 dir /usr/lib64 755 0 0 dir /mnt 755 0 0 dir /mnt/root 755 0 0 -dir /run/lock 755 0 0 -dir /run/lock/cryptsetup 755 0 0 # Ld file /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 755 0 0 diff --git a/sys-boot/myinitramfs/files/gen.sh b/sys-boot/myinitramfs/files/gen.sh index 697968b..e15edcd 100755 --- a/sys-boot/myinitramfs/files/gen.sh +++ b/sys-boot/myinitramfs/files/gen.sh @@ -22,13 +22,6 @@ cp baselist "$LIST" # Init script echo "file /init ./init.enc 755 0 0" >> "$LIST" echo >> "$LIST" -# GCC library -echo "dir /usr/lib 755 0 0" >> "$LIST" -echo "dir /usr/lib/gcc 755 0 0" >> "$LIST" -find /usr/lib/gcc -type f -name libgcc\*\.so\* | while read -r lib; do - echo "file $lib $lib 755 0 0" >> "$LIST" -done -echo >> "$LIST" # Executables required when USE_DMI if [ -n "$USE_DMI" ]; then echo "file /sbin/initramfs_password ./initramfs_password 755 0 0" >> "$LIST" -- cgit v1.2.3