commit: 5c2d7fc5bbc302c6ad6eac111e375709d7031187 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Aug 9 20:02:07 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Aug 9 20:02:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5c2d7fc5
defaults/initrd.scripts: start_volumes(): Don't wait for /dev/zfs This is not needed anymore and also not working. Bug: https://bugs.gentoo.org/736084 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index b7dbdd8..14f3c4e 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1501,17 +1501,6 @@ copyKeymap() { fi } -# This helper function is to be called using call_func_timeout. -# It enables us to wait a reasonable amount of time until /dev/zfs appears. -waitForZFS() { - while [ ! -c /dev/zfs ] - do - echo >/dev/null - done - - exit 1 -} - splash() { return 0 } @@ -1631,7 +1620,7 @@ start_volumes() { if [ "${USE_ZFS}" = '1' ] then # Avoid race involving asynchronous module loading - if call_func_timeout waitForZFS 5 + if [ ! -e /dev/zfs ] then bad_msg "Cannot import ZFS pool because /dev/zfs is missing" elif [ -z "${ZFS_POOL}" ]
