commit: 94edd477e491da2b900e6d1b1d71884081cf09ab Author: Richard Yao <ryao <AT> gentoo <DOT> org> AuthorDate: Thu Jun 4 02:22:28 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Jun 12 14:55:32 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=94edd477
defaults/linuxrc: Disable unnecessary udev timeout in zpool import This is a regression that was introduced in sys-fs/zfs-kmod-0.7.0. It was originally fixed by 2eb1d04cfbfa397b58a0b388f8ed28688fd114d8, but this neglected to handle the case where booting is done via arguments such as "root=ZFS" or "root=ZFS=rpool/ROOT/gentoo" on the kernel commandline. This handles it. Signed-off-by: Richard Yao <ryao <AT> gentoo.org> Closes: https://github.com/gentoo/genkernel/pull/16 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 2 ++ defaults/linuxrc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 514a8bc..2e3632b 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1630,6 +1630,7 @@ start_volumes() { if [ "${USE_ZFS}" = '1' ] then + export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0 # Avoid race involving asynchronous module loading if call_func_timeout waitForZFS 5 then @@ -1679,6 +1680,7 @@ start_volumes() { fi fi fi + unset ZPOOL_IMPORT_UDEV_TIMEOUT_MS fi } diff --git a/defaults/linuxrc b/defaults/linuxrc index 964a932..e90bd34 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -128,7 +128,6 @@ do ;; dozfs*) USE_ZFS=1 - export ZPOOL_IMPORT_UDEV_TIMEOUT_MS=0 case "${x#*=}" in *force*)