1 |
commit: a571a42421b337380b6f5751635c55906bb8b508 |
2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 29 20:29:46 2018 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 29 20:29:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a571a424 |
7 |
|
8 |
modules: remove the ability to rename modules on the fly |
9 |
|
10 |
Kmod doesn't support the -o switch, so if you have been using this your |
11 |
module loads have been failing. |
12 |
|
13 |
conf.d/modules | 5 ----- |
14 |
init.d/modules.in | 15 ++------------- |
15 |
2 files changed, 2 insertions(+), 18 deletions(-) |
16 |
|
17 |
diff --git a/conf.d/modules b/conf.d/modules |
18 |
index c35b9edf..d13ff895 100644 |
19 |
--- a/conf.d/modules |
20 |
+++ b/conf.d/modules |
21 |
@@ -8,11 +8,6 @@ |
22 |
#modules_2="ipv6" |
23 |
#modules="ohci1394" |
24 |
|
25 |
-# Linux users can give modules a different name when they load - the new name |
26 |
-# will also be used to pick arguments below. |
27 |
-# This is not supported on FreeBSD. |
28 |
-#modules="dummy:dummy1" |
29 |
- |
30 |
# Linux users can give the modules some arguments if needed, per version |
31 |
# if necessary. |
32 |
# Again, the most specific versioned variable will take precedence. |
33 |
|
34 |
diff --git a/init.d/modules.in b/init.d/modules.in |
35 |
index d6dd7a29..08abae3d 100644 |
36 |
--- a/init.d/modules.in |
37 |
+++ b/init.d/modules.in |
38 |
@@ -103,7 +103,7 @@ Linux_modules() |
39 |
x=${x%.*} |
40 |
done |
41 |
|
42 |
- local list= x= xx= y= args= mpargs= a= |
43 |
+ local list= x= xx= y= args= |
44 |
for x in $kv_variant_list ; do |
45 |
eval list=\$modules_$(shell_var "$x") |
46 |
[ -n "$list" ] && break |
47 |
@@ -112,24 +112,13 @@ Linux_modules() |
48 |
|
49 |
[ -n "$list" ] && ebegin "Loading kernel modules" |
50 |
for x in $list; do |
51 |
- a=${x#*:} |
52 |
- if [ "$a" = "$x" ]; then |
53 |
- unset mpargs |
54 |
- else |
55 |
- x=${x%%:*} |
56 |
- mpargs="-o $a" |
57 |
- fi |
58 |
- aa=$(shell_var "$a") |
59 |
xx=$(shell_var "$x") |
60 |
for y in $kv_variant_list ; do |
61 |
- eval args=\$module_${aa}_args_$(shell_var "$y") |
62 |
- [ -n "${args}" ] && break |
63 |
eval args=\$module_${xx}_args_$(shell_var "$y") |
64 |
[ -n "${args}" ] && break |
65 |
done |
66 |
- [ -z "$args" ] && eval args=\$module_${aa}_args |
67 |
[ -z "$args" ] && eval args=\$module_${xx}_args |
68 |
- eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args" |
69 |
+ eval modprobe --use-blacklist --verbose "$x" "$args" |
70 |
done |
71 |
[ -n "$list" ] && eend |
72 |
} |