From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-855488-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 96B6B1388B6
for <garchives@archives.gentoo.org>; Tue, 5 Jan 2016 20:05:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0C3CE21C008;
Tue, 5 Jan 2016 20:05:17 +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 ABAAA21C008
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Jan 2016 20:05:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8AEA334069F
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Jan 2016 20:05:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D34ECEB
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Jan 2016 20:05:14 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@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, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1452024306.8c525fa4528c39b57c8194b749edc8ba29cf9126.robbat2@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: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 8c525fa4528c39b57c8194b749edc8ba29cf9126
X-VCS-Branch: master
Date: Tue, 5 Jan 2016 20:05:14 +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: a9b21abb-286b-4a0f-a4bb-f907e802d3ca
X-Archives-Hash: c2ff83339c6ad86a99262753157ff1c9
commit: 8c525fa4528c39b57c8194b749edc8ba29cf9126
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 20:05:06 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 20:05:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8c525fa4
thinko fix.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
defaults/initrd.scripts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f7f0233..a908cba 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -963,13 +963,13 @@ startVolumes() {
then
for multipath_path in /sbin/multipath /bin/multipath MISSING ; do
[ -x "$multipath_path " ] && break
- fi
+ done
for dmsetup_path in /sbin/dmsetup /bin/dmsetup MISSING ; do
[ -x "$dmsetup_path " ] && break
- fi
+ done
for kpartx_path in /sbin/kpartx /bin/kpartx MISSING ; do
[ -x "$kpartx_path " ] && break
- fi
+ done
fail=0
["${multipath_path}" = "MISSING" ] && fail=1 && bad_msg "domultipath called, but multipath binary missing! Skipping multipath"
["${dmsetup_path}" = "MISSING" ] && fail=1 && bad_msg "domultipath called, but dmsetup binary missing! Skipping multipath"
@@ -1003,7 +1003,7 @@ startVolumes() {
then
for lvm_path in /sbin/lvm /bin/lvm MISSING ; do
[ -x "$lvm_path" ] && break
- fi
+ done
if [ "${lvm_path}" = "MISSING" ]
then
bad_msg "dolvm invoked, but LVM binary not available! skipping LVM volume group activation!"