From a571a42421b337380b6f5751635c55906bb8b508 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 29 Jun 2018 15:29:46 -0500 Subject: modules: remove the ability to rename modules on the fly Kmod doesn't support the -o switch, so if you have been using this your module loads have been failing. --- init.d/modules.in | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'init.d') 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 } -- cgit v1.2.3