From e5933843e81b213786f78bb267f84fa78f663b61 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 2 Jan 2008 10:28:27 +0000 Subject: [PATCH] _opts -> _args to match other scripts --- conf.d.Linux/modules | 4 ++-- init.d.Linux/modules | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.d.Linux/modules b/conf.d.Linux/modules index 485a26cd..7f923e7d 100644 --- a/conf.d.Linux/modules +++ b/conf.d.Linux/modules @@ -5,8 +5,8 @@ #modules_2_6="tun" #modules="ohci1394" -# Give the modules some options if needed. -# module_ieee1394_opts="debug" +# Give the modules some arguments if needed. +# module_ieee1394_args="debug" # You should consult your kernel documentation and configuration # for a list of modules and their options. diff --git a/init.d.Linux/modules b/init.d.Linux/modules index 19e679bf..4a5c1257 100755 --- a/init.d.Linux/modules +++ b/init.d.Linux/modules @@ -57,7 +57,7 @@ start() { x=${KV#*.*.} local KV_MICRO=${x%%-*} - local list= x= opts= cnt=0 + local list= x= args= cnt=0 for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR}; do eval list=\$modules_$(_shell_var "${x}") [ -n "${list}" ] && break @@ -66,8 +66,8 @@ start() { for x in ${list}; do ebegin "Loading module ${x}" - eval opts=\$module_$(_shell_var "${x}")_opts - eval modprobe -q "${x}" "${opts}" + eval args=\$module_$(_shell_var "${x}")_args + eval modprobe -q "${x}" "${args}" eend $? "Failed to load ${x}" && cnt=$((${cnt} + 1)) done einfo "Autoloaded ${cnt} module(s)"