On Wed, Jul 29, 2020 at 03:21:13PM +0000, Luis Chamberlain wrote:
> We currently fail if the following tests if the directory
> /lib/modules/$(uname -r)/kernel/block does not exist. Just make
> this optional. Older distributions won't have this directory.
>
> srp/001
> srp/002
> srp/013
> srp/014
>
> Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
> ---
> common/multipath-over-rdma | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
> index 676d283..f004124 100644
> --- a/common/multipath-over-rdma
> +++ b/common/multipath-over-rdma
> @@ -696,10 +696,13 @@ setup_test() {
>
> # Load the I/O scheduler kernel modules
> (
> - cd "/lib/modules/$(uname -r)/kernel/block" &&
> - for m in *.ko; do
> - [ -e "$m" ] && modprobe "${m%.ko}"
> - done
> + KERNEL_BLOCK="/lib/modules/$(uname -r)/kernel/block"
> + if [ -d $KERNEL_BLOCK ]; then
> + cd $KERNEL_BLOCK &&
This has a couple of shellcheck errors about unquoted variables. Fixed
those up and applied, thanks.
> + for m in *.ko; do
> + [ -e "$m" ] && modprobe "${m%.ko}"
> + done
> + fi
> )
>
> if [ -d /sys/kernel/debug/dynamic_debug ]; then
> --
> 2.27.0
>
