diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-20 12:55:53 -0500 |
---|---|---|
committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-20 13:15:39 -0500 |
commit | bf73363f220ff086d2559e7c2015801f80862749 (patch) | |
tree | d11e0433860ed8b4fae829854dce881bf081cec6 | |
parent | d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4 (diff) |
Add --use-blacklist to modprobe calls in modules and modules-load
This means that we will honor the modprobe black lists.
X-Gentoo-Bug: 594012
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=594012
-rw-r--r-- | init.d/modules-load.in | 2 | ||||
-rw-r--r-- | init.d/modules.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init.d/modules-load.in b/init.d/modules-load.in index c8fe4222..f71f704d 100644 --- a/init.d/modules-load.in +++ b/init.d/modules-load.in @@ -54,7 +54,7 @@ load_modules() ebegin "Loading module $x" case "$RC_UNAME" in FreeBSD) kldload "$x"; rc=$? ;; - Linux) modprobe -q "$x"; rc=$? ;; + Linux) modprobe --use-blacklist -q "$x"; rc=$? ;; *) ;; esac eend $rc "Failed to load $x" diff --git a/init.d/modules.in b/init.d/modules.in index 2568f732..3431c4a6 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -75,7 +75,7 @@ Linux_modules() done [ -z "$args" ] && eval args=\$module_${aa}_args [ -z "$args" ] && eval args=\$module_${xx}_args - eval modprobe -q "$mpargs" "$x" "$args" + eval modprobe --use-blacklist -q "$mpargs" "$x" "$args" eend $? "Failed to load $x" && : $(( cnt += 1 )) done einfo "Autoloaded $cnt module(s)" |