| 1 |
commit: 6a00d8677ac6a1be4ddb4c5021ebfe0e94a623ed |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Tue May 31 18:47:42 2011 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 18:48:11 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6a00d867 |
| 7 |
|
| 8 |
Rename internal function whereis to prompt_user |
| 9 |
|
| 10 |
.. to avoid confustion with whereis(1) from sys-apps/util-linux |
| 11 |
|
| 12 |
--- |
| 13 |
defaults/initrd.scripts | 10 +++++----- |
| 14 |
defaults/linuxrc | 4 ++-- |
| 15 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 18 |
index b228a77..37a7eb4 100755 |
| 19 |
--- a/defaults/initrd.scripts |
| 20 |
+++ b/defaults/initrd.scripts |
| 21 |
@@ -377,7 +377,7 @@ crypt_filter() { |
| 22 |
fi |
| 23 |
} |
| 24 |
|
| 25 |
-whereis(){ |
| 26 |
+prompt_user(){ |
| 27 |
# $1 = variable whose value is the path (examples: "REAL_ROOT", |
| 28 |
# "LUKS_KEYDEV") |
| 29 |
# $2 = label |
| 30 |
@@ -386,7 +386,7 @@ whereis(){ |
| 31 |
eval local oldvalue='$'${1} |
| 32 |
|
| 33 |
[ \( $# != 2 \) -a \( $# != 3 \) ] && \ |
| 34 |
- bad_msg "Bad invocation of function whereis, please file a bug \ |
| 35 |
+ bad_msg "Bad invocation of function prompt_user, please file a bug \ |
| 36 |
report with this message" && exit 1 |
| 37 |
[ -n "${3}" ] && local explnt=" or : ${3}" || local explnt="." |
| 38 |
|
| 39 |
@@ -771,15 +771,15 @@ openLUKS() { |
| 40 |
run_shell |
| 41 |
elif [ ${DEV_ERROR} -eq 1 ] |
| 42 |
then |
| 43 |
- whereis "LUKS_DEVICE" "${LUKS_NAME}" |
| 44 |
+ prompt_user "LUKS_DEVICE" "${LUKS_NAME}" |
| 45 |
DEV_ERROR=0 |
| 46 |
elif [ ${KEY_ERROR} -eq 1 ] |
| 47 |
then |
| 48 |
- whereis "LUKS_KEY" "${LUKS_NAME} key" |
| 49 |
+ prompt_user "LUKS_KEY" "${LUKS_NAME} key" |
| 50 |
KEY_ERROR=0 |
| 51 |
elif [ ${KEYDEV_ERROR} -eq 1 ] |
| 52 |
then |
| 53 |
- whereis "LUKS_KEYDEV" "${LUKS_NAME} key device" |
| 54 |
+ prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device" |
| 55 |
KEYDEV_ERROR=0 |
| 56 |
else |
| 57 |
case "${LUKS_DEVICE}" in |
| 58 |
|
| 59 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 60 |
index 51c4529..94a2ccd 100755 |
| 61 |
--- a/defaults/linuxrc |
| 62 |
+++ b/defaults/linuxrc |
| 63 |
@@ -455,7 +455,7 @@ do |
| 64 |
good_msg "Detected real_root=${ROOT_DEV}" |
| 65 |
REAL_ROOT="${ROOT_DEV}" |
| 66 |
else |
| 67 |
- whereis "REAL_ROOT" "root block device" |
| 68 |
+ prompt_user "REAL_ROOT" "root block device" |
| 69 |
got_good_root=0 |
| 70 |
continue |
| 71 |
fi |
| 72 |
@@ -465,7 +465,7 @@ do |
| 73 |
if [ "${REAL_ROOT}" = '' ] |
| 74 |
then |
| 75 |
# No REAL_ROOT determined/specified. Prompt user for root block device. |
| 76 |
- whereis "REAL_ROOT" "root block device" |
| 77 |
+ prompt_user "REAL_ROOT" "root block device" |
| 78 |
got_good_root=0 |
| 79 |
|
| 80 |
# Check for a block device or /dev/nfs |
Archives