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 <gentoo-commits+bounces-348924-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QRU1E-0001O9-Q9
for garchives@archives.gentoo.org; Tue, 31 May 2011 18:50:21 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0471E1C11E;
Tue, 31 May 2011 18:50:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id CA95D1C11E
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 18:50:13 +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 59E921B4010
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 18:50:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 7149180508
for <gentoo-commits@lists.gentoo.org>; Tue, 31 May 2011 18:50:12 +0000 (UTC)
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" <sping@gentoo.org>
Message-ID: <6a00d8677ac6a1be4ddb4c5021ebfe0e94a623ed.sping@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: sping
X-VCS-Committer-Name: Sebastian Pipping
X-VCS-Revision: 6a00d8677ac6a1be4ddb4c5021ebfe0e94a623ed
Date: Tue, 31 May 2011 18:50:12 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: dd5b0ee5176fe6714d8e8112b9ac2307
commit: 6a00d8677ac6a1be4ddb4c5021ebfe0e94a623ed
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue May 31 18:47:42 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue May 31 18:48:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git=
;a=3Dcommit;h=3D6a00d867
Rename internal function whereis to prompt_user
.. to avoid confustion with whereis(1) from sys-apps/util-linux
---
defaults/initrd.scripts | 10 +++++-----
defaults/linuxrc | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index b228a77..37a7eb4 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -377,7 +377,7 @@ crypt_filter() {
fi
}
=20
-whereis(){
+prompt_user(){
# $1 =3D variable whose value is the path (examples: "REAL_ROOT",
# "LUKS_KEYDEV")
# $2 =3D label
@@ -386,7 +386,7 @@ whereis(){
eval local oldvalue=3D'$'${1}
=20
[ \( $# !=3D 2 \) -a \( $# !=3D 3 \) ] && \
- bad_msg "Bad invocation of function whereis, please file a bug \
+ bad_msg "Bad invocation of function prompt_user, please file a bug \
report with this message" && exit 1
[ -n "${3}" ] && local explnt=3D" or : ${3}" || local explnt=3D"."
=09
@@ -771,15 +771,15 @@ openLUKS() {
run_shell
elif [ ${DEV_ERROR} -eq 1 ]
then
- whereis "LUKS_DEVICE" "${LUKS_NAME}"
+ prompt_user "LUKS_DEVICE" "${LUKS_NAME}"
DEV_ERROR=3D0
elif [ ${KEY_ERROR} -eq 1 ]
then
- whereis "LUKS_KEY" "${LUKS_NAME} key"
+ prompt_user "LUKS_KEY" "${LUKS_NAME} key"
KEY_ERROR=3D0
elif [ ${KEYDEV_ERROR} -eq 1 ]
then
- whereis "LUKS_KEYDEV" "${LUKS_NAME} key device"
+ prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device"
KEYDEV_ERROR=3D0
else
case "${LUKS_DEVICE}" in
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 51c4529..94a2ccd 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -455,7 +455,7 @@ do
good_msg "Detected real_root=3D${ROOT_DEV}"
REAL_ROOT=3D"${ROOT_DEV}"
else
- whereis "REAL_ROOT" "root block device"
+ prompt_user "REAL_ROOT" "root block device"
got_good_root=3D0
continue
fi
@@ -465,7 +465,7 @@ do
if [ "${REAL_ROOT}" =3D '' ]
then
# No REAL_ROOT determined/specified. Prompt user for root block devic=
e.
- whereis "REAL_ROOT" "root block device"
+ prompt_user "REAL_ROOT" "root block device"
got_good_root=3D0
=20
# Check for a block device or /dev/nfs