emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --use-blacklist to modprobe calls in modules and modules-load

Browse Source 
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
This commit is contained in:
William Hubbs 2016-09-20 12:55:53 -05:00
parent d6c30ab12a
commit bf73363f22
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.d/modules-load.in
View File

@ -54,7 +54,7 @@ load_modules()
ebegin "Loading module $x" ebegin "Loading module $x"
case "$RC_UNAME" in case "$RC_UNAME" in
FreeBSD) kldload "$x"; rc=$? ;; FreeBSD) kldload "$x"; rc=$? ;;
Linux) modprobe -q "$x"; rc=$? ;; Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
*) ;; *) ;;
esac esac
eend $rc "Failed to load $x" eend $rc "Failed to load $x"

2
init.d/modules.in
View File

@ -75,7 +75,7 @@ Linux_modules()
done done
[ -z "$args" ] && eval args=\$module_${aa}_args [ -z "$args" ] && eval args=\$module_${aa}_args
[ -z "$args" ] && eval args=\$module_${xx}_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 )) eend $? "Failed to load $x" && : $(( cnt += 1 ))
done done
einfo "Autoloaded $cnt module(s)" einfo "Autoloaded $cnt module(s)"