[gentoo-commits] proj/genkernel:master commit in: defaults/

[Thomas Deutschmann]

commit:     e6de787bd21542bbc94efe21eacd99178a756c65
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 17:30:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 19:50:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e6de787b

defaults/initrd.scripts: start_volumes(): Drop ZPOOL_IMPORT_UDEV_TIMEOUT_MS 
workaround

Now that we switched to (E)UDEV usage, this workaround is no longer needed.

Follow-up: 73689f8 ("ZFS: Enable UDEV support")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 22d7e85..b7dbdd8 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1630,7 +1630,6 @@ 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
@@ -1648,7 +1647,6 @@ start_volumes() {
                                bad_msg "Importing ZFS pools failed!"
                        fi
                else
-
                        if [ "$(zpool list -H -o name ${ZFS_POOL} 2>&1)" = 
"${ZFS_POOL}" ]
                        then
                                good_msg "ZFS pool ${ZFS_POOL} already 
imported."
@@ -1690,7 +1688,6 @@ start_volumes() {
                                fi
                        fi
                fi
-               unset ZPOOL_IMPORT_UDEV_TIMEOUT_MS
        fi
 
        udevsettle