commit: 144581ec05710c43c3d23c8de4afffa157166bd1
Author: Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 00:22:05 2014 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 00:25:27 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=144581ec
Revert "Workaround busybox modprobe's inability to load ZFS modules"
This reverts commit 2fa0a9beaa069a61f907f0b06c9bd6abeddb1ca7.
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
Conflicts:
defaults/initrd.scripts
---
defaults/initrd.scripts | 5 ++---
defaults/linuxrc | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 97997b3..611d01c 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -639,10 +639,9 @@ chooseKeymap() {
}
# This helper function is to be called using call_func_timeout.
-# This works around the inability of busybox modprobe to handle complex module
dependencies.
-# This also enables us to wait a reasonable amount of time until /dev/zfs
appears.
+# It enables us to wait a reasonable amount of time until /dev/zfs appears.
waitForZFS() {
- while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
+ while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
exit 1
}
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6f950eb..ed808e4 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -310,6 +310,8 @@ then
break
fi
done
+
+ [ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
fi
splash 'init'
