Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly pick module parameters from modules.conf
[fs/lustre-release.git]
/
lustre
/
tests
/
test-framework.sh
diff --git
a/lustre/tests/test-framework.sh
b/lustre/tests/test-framework.sh
index
9302d23
..
7cc95d8
100644
(file)
--- a/
lustre/tests/test-framework.sh
+++ b/
lustre/tests/test-framework.sh
@@
-294,7
+294,7
@@
load_module() {
eval set -- \$$optvar
if [ $# -eq 0 -a -n "$MODPROBECONF" ]; then
# Nothing in $MODOPTS_<MODULE>; try modprobe.conf
eval set -- \$$optvar
if [ $# -eq 0 -a -n "$MODPROBECONF" ]; then
# Nothing in $MODOPTS_<MODULE>; try modprobe.conf
- set -- $(grep
"^options\\s*\<${module}\>
" $MODPROBECONF)
+ set -- $(grep
-P "^options\\s+${BASE}
" $MODPROBECONF)
# Get rid of "options $module"
(($# > 0)) && shift 2
# Get rid of "options $module"
(($# > 0)) && shift 2