aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gmail.com>2013-06-09 09:28:23 -0400
committerRichard Yao <ryao@cs.stonybrook.edu>2013-06-09 09:56:25 -0400
commit987bb3098e81c43e8aaf2a02830508acb801ac0c (patch)
tree80a5887ade39521fb014597a6db5c3efdf51e2d6 /defaults
parentWorkaround busybox modprobe's inability to load ZFS modules (diff)
downloadgenkernel-987bb3098e81c43e8aaf2a02830508acb801ac0c.tar.gz
genkernel-987bb3098e81c43e8aaf2a02830508acb801ac0c.tar.bz2
genkernel-987bb3098e81c43e8aaf2a02830508acb801ac0c.zip
Make busybox's module loading more fully featured, bug #472312
Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe with busybox's modprobe. Unfortunately, this caused a regression where busybox's modprobe fails to properly load certain modules. This can be addressed by abandoning CONFIG_MODPROBE_SMALL=y. We also set a few other features to make module loading more fully featured. Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'defaults')
-rw-r--r--defaults/busy-config16
1 files changed, 8 insertions, 8 deletions
diff --git a/defaults/busy-config b/defaults/busy-config
index f086b143..513ff0b6 100644
--- a/defaults/busy-config
+++ b/defaults/busy-config
@@ -487,16 +487,16 @@ CONFIG_CHPASSWD=y
# Linux Module Utilities
#
CONFIG_MODINFO=y
-CONFIG_MODPROBE_SMALL=y
-CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y
-CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
+CONFIG_MODPROBE=y
# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
+CONFIG_DEPMOD=y
#
# Options common to multiple modutils