[gentoo-commits] proj/genkernel:ryao commit in: defaults/

["Richard Yao" <ryao@gentoo.org>]

commit:     1ffe68f499e1b95e951413731bd6fd0f55dede61
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 11:36:43 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 11:51:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=1ffe68f4

Workaround busybox modprobe's inability to load ZFS modules

Commit 3a054014e880e5b1ff28e3d87767c45a073da6b5 replaced our modprobe
with busybox's modprobe. Unfortunately, busybox's modprobe appears to be
unable to properly load modules with more than 1 level of dependencies.

The zfs and zpool commands will call invoke modprobe if /dev/zvol is
missing, which concealed this problem. However, this caused problems
because some invocations would fail and under certain circumstances,
init would be killed, causing a kernel panic. We prevent this by
explicitly calling modprobe on each of the dependencies before
attempting to import the pool.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 defaults/linuxrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9ea305b..60294e6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -300,7 +300,7 @@ if [ "USE_ZFS" = "1" ]
 then
 	if [ -x /sbin/zfs -a -x /sbin/zpool ]
 	then
-		MY_HWOPTS="${MY_HWOPTS} zfs"
+		MY_HWOPTS="${MY_HWOPTS} zlib_deflate spl zavl znvpair zcommon zunicode zfs"
 	else
 		USE_ZFS=0