From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pmqxe-0001C0-5K for garchives@archives.gentoo.org; Tue, 08 Feb 2011 17:02:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23CC3E08E9; Tue, 8 Feb 2011 17:02:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E1C4DE08DF for ; Tue, 8 Feb 2011 17:02:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 577071B4213 for ; Tue, 8 Feb 2011 17:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A71548006A for ; Tue, 8 Feb 2011 17:02:33 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: Subject: [gentoo-commits] proj/genkernel:experimental commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: d9f46bb5131266f979734895feaaf921f49d30af Date: Tue, 8 Feb 2011 17:02:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f3a3a50ef0694df1c512777d85c26754 commit: d9f46bb5131266f979734895feaaf921f49d30af Author: craig haquarter de> AuthorDate: Sun Oct 10 22:21:05 2010 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Tue Feb 8 16:56:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dd9f46bb5 Add iBFT support for iSCSI --- defaults/initrd.scripts | 8 +++++++- defaults/linuxrc | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 249b721..f7f01de 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -689,10 +689,16 @@ startVolumes() { } =20 startiscsi() { +=09 + if [ ! -n "${ISCSI_NOIBFT}" ] + then + good_msg "Activating iSCSI via iBFT" + iscsistart -b + fi =20 if [ -n "${ISCSI_INITIATORNAME}" ] && [ -n "${ISCSI_TARGET}" ] && [ -n = "${ISCSI_ADDRESS}" ] then - good_msg "Activating iSCSI" + good_msg "Activating iSCSI via cmdline" =20 if [ "${ISCSI_TGPT}" ] then diff --git a/defaults/linuxrc b/defaults/linuxrc index f1e124b..ae0535b 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -294,7 +294,10 @@ start_dev_mgr [ "${DO_slowusb}" ] && sleep 10 =20 # Start iSCSI -startiscsi +if [ -e /bin/iscsistart ] +then + startiscsi +fi =20 # Setup btrfs, see bug 303529 setup_btrfsctl