From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3A66138359 for ; Sun, 9 Aug 2020 19:51:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29994E08E0; Sun, 9 Aug 2020 19:51:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10EF3E08E0 for ; Sun, 9 Aug 2020 19:51:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0AE034EFAA for ; Sun, 9 Aug 2020 19:51:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F5602CC for ; Sun, 9 Aug 2020 19:51:35 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1597002643.e6de787bd21542bbc94efe21eacd99178a756c65.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e6de787bd21542bbc94efe21eacd99178a756c65 X-VCS-Branch: master Date: Sun, 9 Aug 2020 19:51:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 500a4610-457b-4e92-9b8f-96f590c7fdd8 X-Archives-Hash: c877e22513100811ebd28ed7ede305a7 commit: e6de787bd21542bbc94efe21eacd99178a756c65 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 9 17:30:03 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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