From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-631989-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id B81071381F3
for <garchives@archives.gentoo.org>; Wed, 2 Oct 2013 12:43:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2618E0B1D;
Wed, 2 Oct 2013 12:43:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3DB17E0B1D
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Oct 2013 12:43:38 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 212EB33ED79
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Oct 2013 12:43:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id CFA91E545F
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Oct 2013 12:43:34 +0000 (UTC)
From: "Richard Yao" <ryao@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" <ryao@gentoo.org>
Message-ID: <1377098334.7f988ea77debe3f5d0627568584af60a4625f251.ryao@gentoo>
Subject: [gentoo-commits] proj/genkernel:ryao commit in: defaults/
X-VCS-Repository: proj/genkernel
X-VCS-Files: defaults/initrd.scripts
X-VCS-Directories: defaults/
X-VCS-Committer: ryao
X-VCS-Committer-Name: Richard Yao
X-VCS-Revision: 7f988ea77debe3f5d0627568584af60a4625f251
X-VCS-Branch: ryao
Date: Wed, 2 Oct 2013 12:43:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3f4d6507-cef1-439d-bba7-619eebce1e7c
X-Archives-Hash: 972e39d36b53c4c3b0a259419b014125
commit: 7f988ea77debe3f5d0627568584af60a4625f251
Author: Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 15:18:54 2013 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 15:18:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7f988ea7
Add exit 1 to waitForZFS
Proper use of call_func_timeout() requires that we return an exit status
of 1 upon success.
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
---
defaults/initrd.scripts | 1 +
1 file changed, 1 insertion(+)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cb0fcb8..4b7c5ba 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -641,6 +641,7 @@ chooseKeymap() {
# This also enables us to wait a reasonable amount of time until /dev/zfs appears.
waitForZFS() {
while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
+ exit 1
}
startVolumes() {