diff options
| author |   Richard Yao <ryao@gentoo.org> | 2014-03-15 20:22:05 -0400 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2014-03-15 20:25:27 -0400 |
| commit | 144581ec05710c43c3d23c8de4afffa157166bd1 (patch) | |
| tree | 87f3c63dbd23634e87f6d555c282cdc1ebe4ad1d | |
| parent | Load modules by absolute path in busybox modprobe (diff) | |
| download | genkernel-144581ec05710c43c3d23c8de4afffa157166bd1.tar.gz genkernel-144581ec05710c43c3d23c8de4afffa157166bd1.tar.bz2 genkernel-144581ec05710c43c3d23c8de4afffa157166bd1.zip | |
Revert "Workaround busybox modprobe's inability to load ZFS modules"
This reverts commit 2fa0a9beaa069a61f907f0b06c9bd6abeddb1ca7.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Conflicts:
defaults/initrd.scripts
| -rw-r--r-- | defaults/initrd.scripts | 5 | ||||
| -rw-r--r-- | defaults/linuxrc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 97997b36..611d01c8 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 6f950ebc..ed808e45 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' |