46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From aced07e06b9b274439eeb90e235edf42780b4a7a Mon Sep 17 00:00:00 2001
|
||
|
From: Mike Yuan <me@yhndnzj.com>
|
||
|
Date: Tue, 5 Mar 2024 01:42:38 +0800
|
||
|
Subject: [PATCH] install: correctly read library paths
|
||
|
|
||
|
Follow-up for 2ed5a05034e70e5c511aa25a5aabef951dd4e912
|
||
|
|
||
|
The -d option of 'read' denotes the end of each read
|
||
|
rather than each variable assignment. -d '' results
|
||
|
in nothing being read, and these libraries are not
|
||
|
added to initrd...
|
||
|
---
|
||
|
install/sd-encrypt | 2 +-
|
||
|
install/systemd | 2 +-
|
||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/install/sd-encrypt b/install/sd-encrypt
|
||
|
index e60d883..a2a9c2c 100644
|
||
|
--- a/install/sd-encrypt
|
||
|
+++ b/install/sd-encrypt
|
||
|
@@ -39,7 +39,7 @@ build() {
|
||
|
add_binary '/usr/lib/ossl-modules/legacy.so'
|
||
|
|
||
|
# add libraries dlopen()ed by systemd-cryptsetup
|
||
|
- LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "libfido2.so*" | while read -r -d '' FILE; do
|
||
|
+ LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "libfido2.so*" | while read -r FILE; do
|
||
|
if [[ -L "${FILE}" ]]; then
|
||
|
add_symlink "${FILE}"
|
||
|
else
|
||
|
diff --git a/install/systemd b/install/systemd
|
||
|
index 808750c..34b06ba 100644
|
||
|
--- a/install/systemd
|
||
|
+++ b/install/systemd
|
||
|
@@ -128,7 +128,7 @@ build() {
|
||
|
# kmod -> systemd-shared
|
||
|
# qrencode -> bsod
|
||
|
for LIB in kmod tss2-{esys,rc,mu,tcti-'*'} qrencode; do
|
||
|
- LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*" | while read -r -d '' FILE; do
|
||
|
+ LC_ALL=C.UTF-8 find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*" | while read -r FILE; do
|
||
|
if [[ -L "${FILE}" ]]; then
|
||
|
add_symlink "${FILE}"
|
||
|
else
|
||
|
--
|
||
|
GitLab
|
||
|
|