diff options
| -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 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' |