diff options
| author | Dan Streetman <ddstreet@canonical.com> | 2019-07-13 23:03:26 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-17 08:34:48 +0200 |
| commit | 59279e9618d259cf7bf8534908f91e0cdb978a3b (patch) | |
| tree | 26895bf1ee5126fd46a785e53d9a2b3b28e4c319 /test | |
| parent | b5efca2a654d10fdd52599bd8a009dde8a7c61b4 (diff) | |
| download | systemd-59279e9618d259cf7bf8534908f91e0cdb978a3b.tar.gz | |
test/test-functions: fix install_dmeventd to correctly install bin/libs
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/test/test-functions b/test/test-functions index 1aef07a44e..32136bf534 100644 --- a/test/test-functions +++ b/test/test-functions @@ -486,8 +486,7 @@ install_fsck() { install_dmevent() { instmods dm_crypt =crypto - type -P dmeventd >/dev/null && dracut_install dmeventd - inst_libdir_file "libdevmapper-event.so*" + inst_binary dmeventd if [[ "$LOOKS_LIKE_DEBIAN" ]]; then # dmsetup installs 55-dm and 60-persistent-storage-dm on Debian/Ubuntu # and since buster/bionic 95-dm-notify.rules @@ -1653,32 +1652,6 @@ instmods() { 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() { ln -fs ../usr/bin/systemctl $initdir/bin/ ln -fs ../usr/lib/systemd $initdir/lib/ |