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 3E112138F88 for ; Thu, 27 Feb 2014 04:47:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0159E0A8E; Thu, 27 Feb 2014 04:47:09 +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 EF479E0A8E for ; Thu, 27 Feb 2014 04:47:08 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24BCB33FDF7 for ; Thu, 27 Feb 2014 04:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8A67D188A2 for ; Thu, 27 Feb 2014 04:47:05 +0000 (UTC) From: "Richard Yao" 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" Message-ID: <1393475308.32585f117ffbf6d6a0aa317e6876ae7711a7f307.ryao@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: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 32585f117ffbf6d6a0aa317e6876ae7711a7f307 X-VCS-Branch: master Date: Thu, 27 Feb 2014 04:47:05 +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: c2d3288e-7494-4f83-a594-e375f35106e8 X-Archives-Hash: 6855f539e8113259273f94c0d6ffb92b commit: 32585f117ffbf6d6a0aa317e6876ae7711a7f307 Author: Richard Yao gentoo org> AuthorDate: Wed Aug 21 15:18:54 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Thu Feb 27 04:28:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=32585f11 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 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() {