shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

test/test-functions: fix install_dmeventd to correctly install bin/libs

Browse Source
This commit is contained in:
Dan Streetman 2019-07-13 23:03:26 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent b5efca2a65
commit 59279e9618
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/test-functions
View File

@ -486,8 +486,7 @@ install_fsck() {
install_dmevent() { install_dmevent() {
instmods dm_crypt =crypto instmods dm_crypt =crypto
type -P dmeventd >/dev/null && dracut_install dmeventd inst_binary dmeventd
inst_libdir_file "libdevmapper-event.so*"
if [[ "$LOOKS_LIKE_DEBIAN" ]]; then if [[ "$LOOKS_LIKE_DEBIAN" ]]; then
# dmsetup installs 55-dm and 60-persistent-storage-dm on Debian/Ubuntu # dmsetup installs 55-dm and 60-persistent-storage-dm on Debian/Ubuntu
# and since buster/bionic 95-dm-notify.rules # and since buster/bionic 95-dm-notify.rules
@ -1653,32 +1652,6 @@ instmods() {
return $_ret return $_ret
} }
# inst_libdir_file [-n <pattern>] <file> [<file>...]
# Install a <file> located on a lib directory to the initramfs image
# -n <pattern> install non-matching files
inst_libdir_file() {
if [[ "$1" == "-n" ]]; then
local _pattern=$1
shift 2
for _dir in $libdirs; do
for _i in "$@"; do
for _f in "$_dir"/$_i; do
[[ "$_i" =~ $_pattern ]] || continue
[[ -e "$_i" ]] && dracut_install "$_i"
done
done
done
else
for _dir in $libdirs; do
for _i in "$@"; do
for _f in "$_dir"/$_i; do
[[ -e "$_f" ]] && dracut_install "$_f"
done
done
done
fi
}
setup_suse() { setup_suse() {
ln -fs ../usr/bin/systemctl $initdir/bin/ ln -fs ../usr/bin/systemctl $initdir/bin/
ln -fs ../usr/lib/systemd $initdir/lib/ ln -fs ../usr/lib/systemd $initdir/lib/