From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-520575-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 1358B1381F3
for <garchives@archives.gentoo.org>; Mon, 5 Nov 2012 18:32:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EF6CFE0595;
Mon, 5 Nov 2012 18:30:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id D06B921C036
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Nov 2012 18:30:32 +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 E72CE33D8AF
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Nov 2012 18:30:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id D2A98E545E
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Nov 2012 18:30:29 +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: <1351875962.3fa1bf680d90f5841d8830634ed13bbfd76271b7.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: 3fa1bf680d90f5841d8830634ed13bbfd76271b7
X-VCS-Branch: ryao
Date: Mon, 5 Nov 2012 18:30:29 +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: ec78c29a-0266-425d-895e-32985fe1cf36
X-Archives-Hash: 0021ffddc397e794b6efc28b75d89069
commit: 3fa1bf680d90f5841d8830634ed13bbfd76271b7
Author: Marek Sapota <marek <AT> sapota <DOT> org>
AuthorDate: Fri Nov 2 17:04:18 2012 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Fri Nov 2 17:06:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3fa1bf68
Bug #378105: UUID/LABEL support for LUKS keydevs
LUKS keydevs now support mount by UUID/LABEL.
X-Gentoo-Bug: 378105
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=378105
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
---
defaults/initrd.scripts | 83 ++++++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 53e1f97..7cb41b3 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -282,6 +282,36 @@ findnfsmount() {
fi
}
+find_real_device() {
+ local DEVICE="${1}"
+ case "${DEVICE}" in
+ UUID\=*|LABEL\=*)
+ local REAL_DEVICE=""
+ local retval=1
+
+ if [ "${retval}" -ne 0 ]; then
+ REAL_DEVICE=`findfs "${DEVICE}" 2>/dev/null`
+ retval=$?
+ fi
+
+ if [ "$retval" -ne 0 ]; then
+ REAL_DEVICE=`busybox findfs "${DEVICE}" 2>/dev/null`
+ retval=$?
+ fi
+
+ if [ "${retval}" -ne 0 ]; then
+ REAL_DEVICE=`blkid -o device -l -t "${DEVICE}"`
+ retval=$?
+ fi
+
+ if [ "${retval}" -eq 0 ] && [ -n "${REAL_DEVICE}" ]; then
+ DEVICE="${REAL_DEVICE}"
+ fi
+ ;;
+ esac
+ echo -n "${DEVICE}"
+}
+
check_loop() {
if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
then
@@ -811,32 +841,7 @@ openLUKS() {
prompt_user "LUKS_KEYDEV" "${LUKS_NAME} key device"
KEYDEV_ERROR=0
else
- case "${LUKS_DEVICE}" in
- UUID\=*|LABEL\=*)
- local REAL_LUKS=""
- local retval=1
-
- if [ "${retval}" -ne 0 ]; then
- REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null`
- retval=$?
- fi
-
- if [ "$retval" -ne 0 ]; then
- REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null`
- retval=$?
- fi
-
- if [ "${retval}" -ne 0 ]; then
- REAL_LUKS=`blkid -o device -l -t "${LUKS_DEVICE}"`
- retval=$?
- fi
-
- if [ "${retval}" -eq 0 ] && [ -n "${REAL_LUKS}" ]; then
- good_msg "Detected device ${REAL_LUKS}"
- LUKS_DEVICE="${REAL_LUKS}"
- fi
- ;;
- esac
+ LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
setup_md_device ${LUKS_DEVICE}
cryptsetup isLuks ${LUKS_DEVICE}
@@ -855,10 +860,12 @@ openLUKS() {
if [ -n "${LUKS_KEY}" ]
then
+ local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
if [ ! -e "${mntkey}${LUKS_KEY}" ]
then
- if [ -b "${LUKS_KEYDEV}" ]
- then good_msg "Using key device ${LUKS_KEYDEV}." ${CRYPT_SILENT}
+ REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+ if [ -b "${REAL_LUKS_KEYDEV}" ]
+ then good_msg "Using key device ${REAL_LUKS_KEYDEV}." ${CRYPT_SILENT}
else
good_msg "Please insert removable device ${LUKS_KEYDEV} for ${LUKS_NAME}" ${CRYPT_SILENT}
# abort after 10 secs
@@ -867,18 +874,20 @@ openLUKS() {
do
count=$((count-1))
sleep 1
- if [ -b "${LUKS_KEYDEV}" ]
+ REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+ if [ -b "${REAL_LUKS_KEYDEV}" ]
then
- good_msg "Removable device ${LUKS_KEYDEV} detected." ${CRYPT_SILENT}
+ good_msg "Removable device ${REAL_LUKS_KEYDEV} detected." ${CRYPT_SILENT}
break
fi
done
- if [ ! -b "${LUKS_KEYDEV}" ]
+ if [ ! -b "${REAL_LUKS_KEYDEV}" ]
then
eval CRYPT_${TYPE}_KEY=${LUKS_KEY}
bootstrapKey ${TYPE}
eval LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
- if [ ! -b "${LUKS_KEYDEV}" ]; then
+ REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
+ if [ ! -b "${REAL_LUKS_KEYDEV}" ]; then
KEYDEV_ERROR=1
bad_msg "Removable device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
continue
@@ -890,27 +899,27 @@ openLUKS() {
# At this point a device was recognized, now let's see if the key is there
[ ! -d "$mntkey" ] && mkdir -p ${mntkey} 2>/dev/null >/dev/null
- mount -n -o ro ${LUKS_KEYDEV} ${mntkey} >/dev/null 2>/dev/null
+ mount -n -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>/dev/null
if [ "$?" != '0' ]
then
KEYDEV_ERROR=1
- bad_msg "Mounting of device ${LUKS_KEYDEV} failed." ${CRYPT_SILENT}
+ bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT}
continue
else
- good_msg "Removable device ${LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
+ good_msg "Removable device ${REAL_LUKS_KEYDEV} mounted." ${CRYPT_SILENT}
sleep 2
# keyfile exists?
if [ ! -e "${mntkey}${LUKS_KEY}" ]; then
umount -n ${mntkey} 2>/dev/null >/dev/null
KEY_ERROR=1
KEYDEV_ERROR=1
- bad_msg "Key {LUKS_KEY} on device ${LUKS_KEYDEV} not found." ${CRYPT_SILENT}
+ bad_msg "Key {LUKS_KEY} on device ${REAL_LUKS_KEYDEV} not found." ${CRYPT_SILENT}
continue
fi
fi
fi
# At this point a candidate key exists (either mounted before or not)
- good_msg "${LUKS_KEY} on device ${LUKS_KEYDEV} found" ${CRYPT_SILENT}
+ good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
mknod /dev/tty c 5 1