kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypt: change /tmp/luks.keys seperator from "|" to ":" 

Do it like on the kernel command line, so we only have one forbidden
character.
master
Harald Hoyer 2010-11-12 14:11:33 +01:00
parent c7e72136b2
commit 91f4d45f93
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules.d/90crypt/crypt-lib.sh
View File

@ -95,12 +95,12 @@ $dev
# #
# Reads file <keysfile> produced by probe-keydev and looks for first line to # Reads file <keysfile> produced by probe-keydev and looks for first line to
# which device <for_dev> matches. The successful result is printed in format # which device <for_dev> matches. The successful result is printed in format
# "<keydev>|<keypath>". When nothing found, just false is returned. # "<keydev>:<keypath>". When nothing found, just false is returned.
# #
# Example: # Example:
# getkey /tmp/luks.keys /dev/sdb1 # getkey /tmp/luks.keys /dev/sdb1
# May print: # May print:
# /dev/sdc1|/keys/some.key # /dev/sdc1:/keys/some.key
getkey() { getkey() {
local keys_file="$1"; local for_dev="$2" local keys_file="$1"; local for_dev="$2"
local luks_dev; local key_dev; local key_path local luks_dev; local key_dev; local key_path
@ -108,9 +108,9 @@ getkey() {
[ -z "$keys_file" -o -z "$for_dev" ] && die 'getkey: wrong usage!' [ -z "$keys_file" -o -z "$for_dev" ] && die 'getkey: wrong usage!'
[ -f "$keys_file" ] || return 1 [ -f "$keys_file" ] || return 1


while IFS='|' read luks_dev key_dev key_path; do while IFS=':' read luks_dev key_dev key_path; do
if match_dev "$luks_dev" "$for_dev"; then if match_dev "$luks_dev" "$for_dev"; then
echo "${key_dev}|${key_path}" echo "${key_dev}:${key_path}"
return 0 return 0
fi fi
done < "$keys_file" done < "$keys_file"

4
modules.d/90crypt/cryptroot-ask.sh
View File

@ -62,8 +62,8 @@ info "luksOpen $device $luksname"


if [ -n "$(getarg rd.luks.key)" ]; then if [ -n "$(getarg rd.luks.key)" ]; then
if tmp=$(getkey /tmp/luks.keys $device); then if tmp=$(getkey /tmp/luks.keys $device); then
keydev="${tmp%%|*}" keydev="${tmp%%:*}"
keypath="${tmp#*|}" keypath="${tmp#*:}"
else else
info "No key found for $device. Will try later." info "No key found for $device. Will try later."
/sbin/initqueue --unique --onetime --settled \ /sbin/initqueue --unique --onetime --settled \

2
modules.d/90crypt/probe-keydev.sh
View File

@ -12,4 +12,4 @@ info "Probing $real_keydev for $keypath..."
test_dev -f "$real_keydev" "$keypath" || exit 1 test_dev -f "$real_keydev" "$keypath" || exit 1


info "Found $keypath on $real_keydev" info "Found $keypath on $real_keydev"
echo "$luksdev|$real_keydev|$keypath" >> /tmp/luks.keys echo "$luksdev:$real_keydev:$keypath" >> /tmp/luks.keys