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

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

commit:     7bf3e57adcab2900860090efbdb83ac2b9787d8b
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:42:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7bf3e57a

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/initrd.scripts | 6 ++++++
 defaults/linuxrc        | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f598402..4d1cc90 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -721,6 +721,12 @@ startVolumes() {
 	if [ "${USE_ZFS}" = '1' ]
 	then
 
+		# Load modules
+		for i in zlib_deflate spl zavl znvpair zcommon zunicode zfs
+		do
+			modprobe ${i}
+		done
+
 		# Avoid race involving asynchronous module loading
 		if call_func_timeout waitForZFS 5
 		then

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 9ea305b..f54f7d5 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -298,12 +298,9 @@ esac
 # Verify that it is safe to use ZFS
 if [ "USE_ZFS" = "1" ]
 then
-	if [ -x /sbin/zfs -a -x /sbin/zpool ]
+	if [ ! -x /sbin/zfs -o ! -x /sbin/zpool ]
 	then
-		MY_HWOPTS="${MY_HWOPTS} zfs"
-	else
 		USE_ZFS=0
-
 		[ -x /sbin/zfs ] || bad_msg '/sbin/zfs not found!'
 		[ -x /sbin/zpool ] || bad_msg '/sbin/zpool not found!'
 		bad_msg 'Aborting use of zfs!'