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 35DCE1382C5 for ; Fri, 12 Jun 2020 15:03:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55FF2E090A; Fri, 12 Jun 2020 15:03:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 4147FE090A for ; Fri, 12 Jun 2020 15:03:03 +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 CA05E34F169 for ; Fri, 12 Jun 2020 15:03:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1FE521D for ; Fri, 12 Jun 2020 15:02:58 +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: <1591973732.94edd477e491da2b900e6d1b1d71884081cf09ab.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 94edd477e491da2b900e6d1b1d71884081cf09ab X-VCS-Branch: master Date: Fri, 12 Jun 2020 15:02:58 +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: d6e71800-46d5-427d-8b15-b6643d31981f X-Archives-Hash: 579a89d494ae05d2de64956091423931 commit: 94edd477e491da2b900e6d1b1d71884081cf09ab Author: Richard Yao gentoo org> AuthorDate: Thu Jun 4 02:22:28 2020 +0000 Commit: Thomas Deutschmann gentoo 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 gentoo.org> Closes: https://github.com/gentoo/genkernel/pull/16 Signed-off-by: Thomas Deutschmann 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*)