diff options
Diffstat (limited to 'init.d/modules.in')
-rw-r--r-- | init.d/modules.in | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/init.d/modules.in b/init.d/modules.in index c12f7c19..ee9eb880 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -1,5 +1,5 @@ #!@PREFIX@/sbin/runscript -# Copyright 2007-2008 Roy Marples <roy@marples.name> +# Copyright 2007-2009 Roy Marples <roy@marples.name> # All rights reserved. Released under the 2-clause BSD license. description="Loads a user defined list of kernel modules." @@ -24,40 +24,40 @@ start() local KV_MICRO=${x%%-*} local list= x= xx= y= args= mpargs= cnt=0 a= - for x in "${KV}" \ - ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} \ - ${KV_MAJOR}.${KV_MINOR} \ + for x in "$KV" \ + $KV_MAJOR.$KV_MINOR.$KV_MICRO \ + $KV_MAJOR.$KV_MINOR \ ; do - eval list=\$modules_$(shell_var "${x}") - [ -n "${list}" ] && break + eval list=\$modules_$(shell_var "$x") + [ -n "$list" ] && break done - [ -z "${list}" ] && list=${modules} + [ -z "$list" ] && list=$modules - for x in ${list}; do + for x in $list; do a=${x#*:} - if [ "${a}" = "${x}" ]; then + if [ "$a" = "$x" ]; then unset mpargs - ebegin "Loading module ${x}" + ebegin "Loading module $x" else x=${x%%:*} - mpargs="-o ${a}" - ebegin "Loading module ${x} as ${a}" + mpargs="-o $a" + ebegin "Loading module $x as $a" fi - aa=$(shell_var "${a}") - xx=$(shell_var "${x}") - for y in "${KV}" \ - ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} \ - ${KV_MAJOR}.${KV_MINOR} \ + aa=$(shell_var "$a") + xx=$(shell_var "$x") + for y in "$KV" \ + $KV_MAJOR.$KV_MINOR.$KV_MICRO \ + $KV_MAJOR.$KV_MINOR \ ; do - eval args=\$module_${aa}_args_$(shell_var "${y}") + eval args=\$module_${aa}_args_$(shell_var "$y") [ -n "${args}" ] && break - eval args=\$module_${xx}_args_$(shell_var "${y}") + eval args=\$module_${xx}_args_$(shell_var "$y") [ -n "${args}" ] && break done - [ -z "${args}" ] && eval args=\$module_${aa}_args - [ -z "${args}" ] && eval args=\$module_${xx}_args - eval modprobe -q "${mpargs}" "${x}" "${args}" - eend $? "Failed to load ${x}" && cnt=$((${cnt} + 1)) + [ -z "$args" ] && eval args=\$module_${aa}_args + [ -z "$args" ] && eval args=\$module_${xx}_args + eval modprobe -q "$mpargs" "$x" "$args" + eend $? "Failed to load $x" && cnt=$(($cnt + 1)) done - einfo "Autoloaded ${cnt} module(s)" + einfo "Autoloaded $cnt module(s)" } |