From f354a3b24018a976051a4dfcef4a12b913d13739 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Tue, 25 Nov 2008 20:05:17 +0000
Subject: [PATCH] b=17326 i=Brian load_modules fn modprobe.d fix
---
lustre/tests/test-framework.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index dc711299c0..5ccd82601f 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -219,9 +219,10 @@ load_modules() {
load_module ../libcfs/libcfs/libcfs
[ "$PTLDEBUG" ] && lctl set_param debug=$PTLDEBUG
[ "$SUBSYSTEM" ] && lctl set_param subsystem_debug=${SUBSYSTEM# }
+ local MODPROBECONF=
[ -f /etc/modprobe.conf ] && MODPROBECONF=/etc/modprobe.conf
- [ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
- [ -z "$LNETOPTS" -a -n "$MODPROBECONF" ] && \
+ [ ! "$MODPROBECONF" -a -d /etc/modprobe.d ] && MODPROBECONF=/etc/modprobe.d/Lustre
+ [ -z "$LNETOPTS" -a "$MODPROBECONF" ] && \
LNETOPTS=$(awk '/^options lnet/ { print $0}' $MODPROBECONF | sed 's/^options lnet //g')
echo $LNETOPTS | grep -q "accept=all" || LNETOPTS="$LNETOPTS accept=all";
echo "lnet options: '$LNETOPTS'"
--
GitLab