diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-01-15 17:58:05 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-01-15 17:58:05 +0100 |
| commit | f5547a519fee9b43a1e5022601810da9af8e64f4 (patch) | |
| tree | 93be668900e3665b146cceacc25c9be62dcda613 /defaults | |
| parent | Add support for UUID to crypt_root (bug #315467) (diff) | |
| download | genkernel-f5547a519fee9b43a1e5022601810da9af8e64f4.tar.gz genkernel-f5547a519fee9b43a1e5022601810da9af8e64f4.tar.bz2 genkernel-f5547a519fee9b43a1e5022601810da9af8e64f4.zip | |
Add LABEL support to crypt_root, clean up UUID crypt_root patch
Diffstat (limited to 'defaults')
| -rwxr-xr-x | defaults/initrd.scripts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 71f3550a..d1f105f1 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -762,26 +762,26 @@ openLUKS() { KEYDEV_ERROR=0 else case "${LUKS_DEVICE}" in - UUID\=*) - REAL_LUKS="" - retval=1 + UUID\=*|LABEL\=*) + local REAL_LUKS="" + local retval=1 - if [ "${retval}" -ne '0' ]; then + if [ "${retval}" -ne 0 ]; then REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null` retval=$? fi - if [ "$retval" -ne '0' ]; then + if [ "$retval" -ne 0 ]; then REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null` retval=$? fi - if [ "${retval}" -ne '0' ]; then + if [ "${retval}" -ne 0 ]; then REAL_LUKS=`blkid -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null` retval=$? fi - if [ "${retval}" -eq '0' ] && [ -n "${REAL_LUKS}" ]; then + if [ "${retval}" -eq 0 ] && [ -n "${REAL_LUKS}" ]; then good_msg "Detected device ${REAL_LUKS}" LUKS_DEVICE="${REAL_LUKS}" fi |