Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dracut): do not add all lib subdirs to LD_LIBRARY_PATH with --sysroot (bsc#1230354) (SLFO) #373

Merged
merged 3 commits into from
Sep 12, 2024
Merged

fix(dracut): do not add all lib subdirs to LD_LIBRARY_PATH with --sysroot (bsc#1230354) (SLFO) #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7219097
fix(dracut): do not add all lib subdirs to `LD_LIBRARY_PATH` with `--…
xurubezi Sep 10, 2024
cb96e88
feat(systemd): always install libsystemd libraries
aafeijoo-suse Sep 10, 2024
af3b9f6
chore(suse): update SUSE maintainers doc
aafeijoo-suse Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions dracut-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,7 @@ fi
# ldd needs LD_LIBRARY_PATH pointing to the libraries within the sysroot directory
if [[ -n $dracutsysrootdir ]]; then
for lib in $libdirs; do
mapfile -t -d '' lib_subdirs < <(find "$lib" -type d -print0 2> /dev/null)
for lib_subdir in "${lib_subdirs[@]}"; do
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"$LD_LIBRARY_PATH":}$dracutsysrootdir$lib_subdir"
done
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+"$LD_LIBRARY_PATH":}$dracutsysrootdir$lib"
done
export LD_LIBRARY_PATH
fi
Expand Down
3 changes: 2 additions & 1 deletion modules.d/00systemd/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ EOF
# Install library file(s)
_arch=${DRACUT_ARCH:-$(uname -m)}
inst_libdir_file \
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \
{"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so"

}
2 changes: 2 additions & 0 deletions suse/README.susemaint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,5 @@ b5a35f9d feat(zfcp_rules): remove zfcp handling consolidated in s390-tools
6611c6e4 fix(dracut-functions.sh): only return block devices from get_persistent_dev
6c99c073 feat(systemd*): include systemd config files from /usr/lib/systemd
e0b87682 fix(dracut): ldd output borked with `--sysroot`
d0c82322 fix(dracut): do not add all lib subdirs to `LD_LIBRARY_PATH` with `--sysroot`
921792f2 feat(systemd): always install libsystemd libraries
Loading