cut_*: remove hard-coded library paths

Remove all hard-coded library paths and use the _rt_require_lib helper
function to find the real library path in a system.

Signed-off-by: Luis Henriques <lhenriques@suse.com>

diff --git a/cut_cephfs.sh b/cut_cephfs.sh
index e9d747b7fbc938450e6e6bfe621bc778b2cfdfec..f50b16882ab40e251515320a9308996242c62756 100755 (executable)
--- a/cut_cephfs.sh
+++ b/cut_cephfs.sh
@@ -17,13 +17,14 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1 libhandle.so.1 libssl.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
+                  strace mkfs mkfs.xfs \
                   which perl awk bc touch cut chmod true false \
                   fio getfattr setfattr chacl attr killall sync \
                   id sort uniq date expr tac diff head dirname seq \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0" \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_MOUNT_BIN" "/sbin/mount.ceph" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \

diff --git a/cut_cephfs_fuse.sh b/cut_cephfs_fuse.sh
index a718ebbfa581f9acd472dec154cad69ef25db474..15ee469f112f01d85b7a439db05bc5fde2a4e4cd 100755 (executable)
--- a/cut_cephfs_fuse.sh
+++ b/cut_cephfs_fuse.sh
@@ -17,15 +17,14 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1 libfuse.so libcryptopp-5.6.2.so.0 libhandle.so.1 libssl.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
+                  strace mkfs mkfs.xfs \
                   which perl awk bc touch cut chmod true false \
                   fio getfattr setfattr chacl attr killall sync \
                   id sort uniq date expr tac diff head dirname seq \
-                  /usr/lib64/libfuse.so \
-                  /usr/lib64/libcryptopp-5.6.2.so.0 \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0" \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_FUSE_BIN" "/bin/ceph-fuse" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \

diff --git a/cut_dropbear.sh b/cut_dropbear.sh
index bd830db4d2d4b205ae50d0bc29691a6734080262..a9f429d496a008277c4e8f7f82254204e923aec0 100755 (executable)
--- a/cut_dropbear.sh
+++ b/cut_dropbear.sh
@@ -16,9 +16,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 . "${RAPIDO_DIR}/runtime.vars"
 
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1 dropbear chmod" \
+                  strace mkfs.xfs dropbear chmod \
+                  $LIBS_INSTALL_LIST" \
        --include "$RAPIDO_DIR/dropbear_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/vm_autorun.env" \

diff --git a/cut_fstests_cephfs.sh b/cut_fstests_cephfs.sh
index 47ae32ee57ac3762255d93b9bbaa43d30163357a..7f317abe799335d9483a1d3b4e2ef3eea7d770b9 100755 (executable)
--- a/cut_fstests_cephfs.sh
+++ b/cut_fstests_cephfs.sh
@@ -18,17 +18,18 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 _rt_require_dracut_args
 _rt_require_ceph
 _rt_require_fstests
+_rt_require_lib "libkeyutils.so.1 libhandle.so.1 libssl.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
+                  strace mkfs mkfs.xfs \
                   which perl awk bc touch cut chmod true false unlink \
                   mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
                   basename tee egrep hexdump sync xfs_db xfs_io \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
                   dbench /usr/share/dbench/client.txt getconf md5sum od wc \
-                  getfacl setfacl tr xargs sysctl link truncate quota" \
+                  getfacl setfacl tr xargs sysctl link truncate quota \
+                  $LIBS_INSTALL_LIST" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$CEPH_MOUNT_BIN" "/sbin/mount.ceph" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \

diff --git a/cut_fstests_cifs.sh b/cut_fstests_cifs.sh
index 3c0f488519d70b99d601399bb4bbb8ed650a0c8b..d6996cbaf5ac278cd635b15e3c5060e57904f2b3 100755 (executable)
--- a/cut_fstests_cifs.sh
+++ b/cut_fstests_cifs.sh
@@ -17,17 +17,18 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_dracut_args
 _rt_require_fstests
+_rt_require_lib "libkeyutils.so.1 libhandle.so.1 libssl.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
+                  strace mkfs mkfs.xfs \
                   which perl awk bc touch cut chmod true false unlink \
                   mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
                   basename tee egrep hexdump sync xfs_db xfs_io mount.cifs \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
                   dbench /usr/share/dbench/client.txt getconf md5sum od wc \
-                  getfacl setfacl tr xargs sysctl link truncate quota" \
+                  getfacl setfacl tr xargs sysctl link truncate quota \
+                  $LIBS_INSTALL_LIST" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$RAPIDO_DIR/fstests_cifs_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \

diff --git a/cut_fstests_local.sh b/cut_fstests_local.sh
index c77f5f5505ba94f7e0b0061c25894de65ca85029..0e054ed10988ca1a3a8776d50907833c76b58f79 100755 (executable)
--- a/cut_fstests_local.sh
+++ b/cut_fstests_local.sh
@@ -17,18 +17,19 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_dracut_args
 _rt_require_fstests
+_rt_require_lib "libkeyutils.so.1 libhandle.so.1 libssl.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs mkfs.btrfs mkfs.xfs /lib64/libkeyutils.so.1 \
+                  strace mkfs mkfs.btrfs mkfs.xfs \
                   which perl awk bc touch cut chmod true false unlink \
                   mktemp getfattr setfattr chacl attr killall hexdump sync \
                   id sort uniq date expr tac diff head dirname seq \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
                   basename tee egrep xfs_freeze xfs_db xfs_io xfs_info \
                   xfs_logprint xfs_repair xfs_growfs xfs_quota xfs_bmap \
                   fstrim fio logger dmsetup chattr lsattr cmp stat \
                   dbench /usr/share/dbench/client.txt hostname getconf md5sum \
-                  od wc getfacl setfacl tr xargs sysctl link truncate quota" \
+                  od wc getfacl setfacl tr xargs sysctl link truncate quota \
+                  $LIBS_INSTALL_LIST" \
        --include "$FSTESTS_SRC" "/fstests" \
        --include "$RAPIDO_DIR/fstests_local_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \

diff --git a/cut_lio_rbd.sh b/cut_lio_rbd.sh
index 3b48eb360688775641347d0598d0bdc96e5f351a..a0d72982e0fcfbe9664c20226dc884c42c2456a8 100755 (executable)
--- a/cut_lio_rbd.sh
+++ b/cut_lio_rbd.sh
@@ -17,9 +17,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1" \
+                  strace mkfs.xfs \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \
        --include "$RBD_NAMER_BIN" "/usr/bin/ceph-rbdnamer" \

diff --git a/cut_nvme_local.sh b/cut_nvme_local.sh
index 034f4997eb2202f905457e10e875fb916efb6e38..288a37189f9611360f071466d0fe4b032b8b4014 100755 (executable)
--- a/cut_nvme_local.sh
+++ b/cut_nvme_local.sh
@@ -16,9 +16,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 . "${RAPIDO_DIR}/runtime.vars"
 
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1" \
+                  strace mkfs.xfs \
+                  $LIBS_INSTALL_LIST" \
        --include "$RAPIDO_DIR/nvme_local_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/vm_autorun.env" \

diff --git a/cut_nvme_rbd.sh b/cut_nvme_rbd.sh
index 434b9a56c30fde06ea414cf45065552737bb1dd5..6ce2ce8de3db54318a27af351edae2f5cfa6e1ca 100755 (executable)
--- a/cut_nvme_rbd.sh
+++ b/cut_nvme_rbd.sh
@@ -17,9 +17,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1" \
+                  strace mkfs.xfs \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \
        --include "$RBD_NAMER_BIN" "/usr/bin/ceph-rbdnamer" \

diff --git a/cut_nvme_rdma.sh b/cut_nvme_rdma.sh
index acdde5804bd37c66c5214a6ed2e099132db6be68..d239699d4aa270634a06c4d19159533e6a5d0b5e 100755 (executable)
--- a/cut_nvme_rdma.sh
+++ b/cut_nvme_rdma.sh
@@ -16,9 +16,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 . "${RAPIDO_DIR}/runtime.vars"
 
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1 killall nvme" \
+                  strace mkfs.xfs killall nvme \
+                  $LIBS_INSTALL_LIST" \
        --include "$RAPIDO_DIR/nvme_rdma_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/vm_autorun.env" \

diff --git a/cut_qemu_rbd.sh b/cut_qemu_rbd.sh
index d2fb4f1c3be9af55776f107e3ac3c7f77f32e5ea..2a22349997b30f48ae132254fb9e00f48a6a5449 100755 (executable)
--- a/cut_qemu_rbd.sh
+++ b/cut_qemu_rbd.sh
@@ -17,9 +17,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_dracut_args
 _rt_require_ceph
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1 lsscsi" \
+                  strace mkfs.xfs lsscsi \
+                  $LIBS_INSTALL_LIST" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \
        --include "$RAPIDO_DIR/vm_autorun.env" "/.profile" \
        --modules "bash base" \

diff --git a/cut_rbd.sh b/cut_rbd.sh
index 647ed0cb9a8ae79e00040c0986964aa4bbc6a192..3ad41e2f8d5866da23cc72509f40071ceb0a8582 100755 (executable)
--- a/cut_rbd.sh
+++ b/cut_rbd.sh
@@ -17,9 +17,11 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  strace mkfs.xfs /lib64/libkeyutils.so.1" \
+                  strace mkfs.xfs \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \
        --include "$RBD_NAMER_BIN" "/usr/bin/ceph-rbdnamer" \

diff --git a/cut_tcmu_rbd_loop.sh b/cut_tcmu_rbd_loop.sh
index 229319e3c47e9e953410af26a7da2b306706acbc..af84665305e7bb440c49680f3d112fe6ec22bae3 100755 (executable)
--- a/cut_tcmu_rbd_loop.sh
+++ b/cut_tcmu_rbd_loop.sh
@@ -16,6 +16,9 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 . "${RAPIDO_DIR}/runtime.vars"
 
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1 libhandle.so.1 libssl.so.1 libnl-genl-3.so \
+  libgio-2.0.so libcryptopp-5.6.2.so.0 libboost_thread.so.1.54.0 libboost_system.so.1.54.0 \
+  libboost_random.so.1.54.0 libboost_iostreams.so.1.54.0"
 
 [ -n "$TCMU_RUNNER_SRC" ] || _fail "TCMU_RUNNER_SRC needs to be configured"
 tcmu_so_inc=""
@@ -25,14 +28,7 @@ done
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs.xfs mkfs.btrfs sync dirname uuidgen sleep \
-                  /lib64/libkeyutils.so.1 \
-                  /usr/lib64/libnl-genl-3.so /usr/lib64/libgio-2.0.so \
-                  /usr/lib64/libcryptopp-5.6.2.so.0 \
-                  /usr/lib64/libboost_thread.so.1.54.0 \
-                  /usr/lib64/libboost_system.so.1.54.0 \
-                  /usr/lib64/libboost_random.so.1.54.0 \
-                  /usr/lib64/libboost_iostreams.so.1.54.0 \
-                  /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0" \
+                  $LIBS_INSTALL_LIST" \
        --include "${RAPIDO_DIR}/tcmu_rbd_autorun.sh" "/.profile" \
        --include "${RAPIDO_DIR}/rapido.conf" "/rapido.conf" \
        --include "${RAPIDO_DIR}/vm_autorun.env" "/vm_autorun.env" \

diff --git a/cut_usb_rbd.sh b/cut_usb_rbd.sh
index 5982430cacd38d55148604661510a3322414d5d5..93df2197c63ec10e908c45dd989842fe89fddeb2 100755 (executable)
--- a/cut_usb_rbd.sh
+++ b/cut_usb_rbd.sh
@@ -17,13 +17,15 @@ RAPIDO_DIR="$(realpath -e ${0%/*})"
 
 _rt_require_ceph
 _rt_require_dracut_args
+_rt_require_lib "libkeyutils.so.1"
 
 dracut  --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
-                  eject strace mkfs.vfat mountpoint /lib64/libkeyutils.so.1 \
+                  eject strace mkfs.vfat mountpoint \
                   mktemp touch sync cryptsetup dmsetup scp ssh \
                   /usr/lib/udev/rules.d/10-dm.rules \
                   /usr/lib/udev/rules.d/13-dm-disk.rules \
-                  /usr/lib/udev/rules.d/95-dm-notify.rules" \
+                  /usr/lib/udev/rules.d/95-dm-notify.rules \
+                  $LIBS_INSTALL_LIST" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \
        --include "$CEPH_KEYRING" "/etc/ceph/keyring" \
        --include "$RBD_NAMER_BIN" "/usr/bin/ceph-rbdnamer" \