aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-02 10:28:27 +0000
committerRoy Marples <roy@marples.name>2008-01-02 10:28:27 +0000
commite5933843e81b213786f78bb267f84fa78f663b61 (patch)
treed5f14cd0b747ba3a5e533a015888f07198b8f5f3
parentca55270ab0eb2d217eaa8b8ff147187079fe3bd8 (diff)
_opts -> _args to match other scripts
-rw-r--r--conf.d.Linux/modules4
-rwxr-xr-xinit.d.Linux/modules6
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)"