summaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorDenis Vlasenko2008-08-26 01:32:33 +0000
committerDenis Vlasenko2008-08-26 01:32:33 +0000
commit279ca69727066da306d75c3a6e27d22301ab5305 (patch)
treee49bb0712aea4545b97ef1739e6509fec81b59fd /modutils
parentc4e4b6b93661ef4c0b5f1f4bc95fec3e6a97c707 (diff)
downloadbusybox-279ca69727066da306d75c3a6e27d22301ab5305.zip
busybox-279ca69727066da306d75c3a6e27d22301ab5305.tar.gz
modprobe-small: support "blacklist" keyword in /etc/modules/<modulename>
Diffstat (limited to 'modutils')
-rw-r--r--modutils/modprobe-small.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 06c4574..5e33cdc 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -600,7 +600,7 @@ static void process_module(char *name, const char *cmdline_options)
free(deps);
/* insmod -> load it */
- if (!is_rmmod) {
+ if (!is_rmmod && !strstr(options, "blacklist")) {
errno = 0;
if (load_module(info->pathname, options) != 0) {
if (EEXIST != errno) {