From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 144EF58973 for ; Thu, 4 Feb 2016 02:54:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B91F21C001; Thu, 4 Feb 2016 02:54:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE9EA21C001 for ; Thu, 4 Feb 2016 02:54:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 579F6340A9C for ; Thu, 4 Feb 2016 02:54:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FB258E6 for ; Thu, 4 Feb 2016 02:54:21 +0000 (UTC) From: "Stefan Behte" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Behte" Message-ID: <1454554444.c157e8a5cfab8133a94eab7a765152fc45d3a2a8.craig@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: craig X-VCS-Committer-Name: Stefan Behte X-VCS-Revision: c157e8a5cfab8133a94eab7a765152fc45d3a2a8 X-VCS-Branch: master Date: Thu, 4 Feb 2016 02:54:21 +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-Archives-Salt: 3e87c055-37a8-4d68-b660-5b2226c260e4 X-Archives-Hash: 3d27b509ae1def47d965b56803393ee2 commit: c157e8a5cfab8133a94eab7a765152fc45d3a2a8 Author: craig haquarter de> AuthorDate: Thu Feb 4 02:53:48 2016 +0000 Commit: Stefan Behte gentoo org> CommitDate: Thu Feb 4 02:54:04 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c157e8a5 Wait for iscsi to settle, use scandelay method defaults/initrd.scripts | 3 --- defaults/linuxrc | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index a908cba..890893e 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1140,9 +1140,6 @@ startiscsi() { fi iscsistart -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -a "${ISCSI_ADDRESS}" ${ADDITIONAL} - - # let iscsid settle - otherwise mounting the iSCSI-disk will fail (very rarely, though) - sleep 1 fi } diff --git a/defaults/linuxrc b/defaults/linuxrc index e47c10e..ac8f215 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -374,9 +374,6 @@ fi # Ensure that device nodes are properly configured mdev -s || bad_msg "mdev -s failed" -# Apply scan delay if specified -sdelay - cd / # Start iSCSI @@ -385,6 +382,9 @@ then startiscsi fi +# Apply scan delay if specified +sdelay + # Setup btrfs, see bug 303529 setup_btrfsctl