diff options
| -rw-r--r-- | conf.d/modules | 5 | ||||
| -rw-r--r-- | init.d/modules.in | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/conf.d/modules b/conf.d/modules index c35b9edf..d13ff895 100644 --- a/conf.d/modules +++ b/conf.d/modules @@ -8,11 +8,6 @@ #modules_2="ipv6" #modules="ohci1394" -# Linux users can give modules a different name when they load - the new name -# will also be used to pick arguments below. -# This is not supported on FreeBSD. -#modules="dummy:dummy1" - # Linux users can give the modules some arguments if needed, per version # if necessary. # Again, the most specific versioned variable will take precedence. diff --git a/init.d/modules.in b/init.d/modules.in index d6dd7a29..08abae3d 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -103,7 +103,7 @@ Linux_modules() x=${x%.*} done - local list= x= xx= y= args= mpargs= a= + local list= x= xx= y= args= for x in $kv_variant_list ; do eval list=\$modules_$(shell_var "$x") [ -n "$list" ] && break @@ -112,24 +112,13 @@ Linux_modules() [ -n "$list" ] && ebegin "Loading kernel modules" for x in $list; do - a=${x#*:} - if [ "$a" = "$x" ]; then - unset mpargs - else - x=${x%%:*} - mpargs="-o $a" - fi - aa=$(shell_var "$a") xx=$(shell_var "$x") for y in $kv_variant_list ; do - eval args=\$module_${aa}_args_$(shell_var "$y") - [ -n "${args}" ] && break 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 --use-blacklist --verbose "$mpargs" "$x" "$args" + eval modprobe --use-blacklist --verbose "$x" "$args" done [ -n "$list" ] && eend } |