commit:     bf73363f220ff086d2559e7c2015801f80862749
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 17:55:53 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 18:15:39 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bf73363f

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

 init.d/modules-load.in | 2 +-
 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 c8fe422..f71f704 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 2568f73..3431c4a 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)"

Reply via email to