* [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified
@ 2010-11-11 23:59 Amadeusz Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-11 23:59 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
New:
str_starts, str_replace
funiq - print new unique file name
mkuniqdir - create and print new unique dir
splitsep - splits given string 'str' with separator 'sep' into vars
udevmatch - create udev rule match for a device
Modified:
foreach_uuid_until - use $___ as a place holder
---
modules.d/99base/dracut-lib.sh | 137 +++++++++++++++++++++++++++++++++++++--
1 files changed, 130 insertions(+), 7 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 596dae2..f0c030b 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -6,6 +6,29 @@ strstr() {
[ "${1#*$2*}" != "$1" ]
}
+# returns OK if $1 contains $2 at the beginning
+str_starts() {
+ [ "${1#$2*}" != "$1" ]
+}
+
+# replaces all occurrences of 'search' in 'str' with 'replacement'
+#
+# str_replace str search replacement
+#
+# example:
+# str_replace ' one two three ' ' ' '_'
+str_replace() {
+ local in="$1"; local s="$2"; local r="$3"
+ local out=''
+
+ while strstr "${in}" "$s"; do
+ chop="${in%%$s*}"
+ out="${out}${chop# }$r"
+ in="${in#*$s}"
+ done
+ echo "${out}${in}"
+}
+
_getcmdline() {
local _line
unset _line
@@ -142,6 +165,34 @@ getoptcomma() {
return 1
}
+# Splits given string 'str' with separator 'sep' into variables 'var1', 'var2',
+# 'varN'. If number of fields is less than number of variables, remaining are
+# not set. If number of fields is greater than number of variables, the last
+# variable takes remaining fields. In short - it acts similary to 'read'.
+#
+# splitsep sep str var1 var2 varN
+#
+# example:
+# splitsep ':' 'foo:bar:baz' v1 v2
+# in result:
+# v1='foo', v2='bar:baz'
+#
+# TODO: ':' inside fields.
+splitsep() {
+ local sep="$1"; local str="$2"; shift 2
+ local tmp
+
+ while [ -n "$str" -a -n "$*" ]; do
+ tmp="${str%%:*}"
+ eval "$1=${tmp}"
+ str="${str#$tmp}"
+ str="${str#:}"
+ shift
+ done
+
+ return 0
+}
+
setdebug() {
if [ -z "$RDDEBUG" ]; then
if [ -e /proc/cmdline ]; then
@@ -337,32 +388,104 @@ ip_to_var() {
esac
}
-# Evaluate command for UUIDs either given as arguments for this function or all
+# Create udev rule match for a device with its device name, or the udev property
+# ID_FS_UUID or ID_FS_LABEL
+#
+# example:
+# udevmatch LABEL=boot
+# prints:
+# ENV{ID_FS_LABEL}="boot"
+#
+# TOOD: symlinks
+udevmatch() {
+ case "$1" in
+ UUID=????????-????-????-????-????????????|LABEL=*)
+ printf 'ENV{ID_FS_%s}=="%s"' "${1%%=*}" "${1#*=}"
+ ;;
+ UUID=*)
+ printf 'ENV{ID_FS_UUID}=="%s*"' "${1#*=}"
+ ;;
+ /dev/?*) printf 'KERNEL=="%s"' "${1#/dev/}" ;;
+ *) return 255 ;;
+ esac
+}
+
+# Prints unique path for potential file inside specified directory. It consists
+# of specified directory, prefix and number at the end which is incremented
+# until non-existing file is found.
+#
+# funiq dir prefix
+#
+# example:
+# # ls /mnt
+# cdrom0 cdrom1
+#
+# # funiq /mnt cdrom
+# /mnt/cdrom2
+funiq() {
+ local dir="$1"; local prefix="$2"
+ local i=0
+
+ [ -d "${dir}" ] || return 1
+
+ while [ -e "${dir}/${prefix}$i" ]; do
+ i=$(($i+1)) || return 1
+ done
+
+ echo "${dir}/${prefix}$i"
+}
+
+# Creates unique directory and prints its path. It's using funiq to generate
+# path.
+#
+# mkuniqdir subdir new_dir_name
+mkuniqdir() {
+ local dir="$1"; local prefix="$2"
+ local retdir; local retdir_new
+
+ [ -d "${dir}" ] || mkdir -p "${dir}" || return 1
+
+ retdir=$(funiq "${dir}" "${prefix}") || return 1
+ until mkdir "${retdir}" 2>/dev/null; do
+ retdir_new=$(funiq "${dir}" "${prefix}") || return 1
+ [ "$retdir_new" = "$retdir" ] && return 1
+ retdir="$retdir_new"
+ done
+
+ echo "${retdir}"
+}
+
+# Evaluates command for UUIDs either given as arguments for this function or all
# listed in /dev/disk/by-uuid. UUIDs doesn't have to be fully specified. If
-# beginning is given it is expanded to all matching UUIDs. To pass full UUID
-# to your command use '${full_uuid}'. Remember to escape '$'!
+# beginning is given it is expanded to all matching UUIDs. To pass full UUID to
+# your command use '$___' as a place holder. Remember to escape '$'!
+#
+# foreach_uuid_until [ -p prefix ] command UUIDs
#
-# $1 = command to be evaluated
-# $2 = list of UUIDs separated by space
+# prefix - string to put just before $___
+# command - command to be evaluated
+# UUIDs - list of UUIDs separated by space
#
# The function returns after *first successful evaluation* of the given command
# with status 0. If evaluation fails for every UUID function returns with
# status 1.
#
# Example:
-# foreach_uuid_until "mount -U \${full_uuid} /mnt; echo OK; umount /mnt" \
+# foreach_uuid_until "mount -U \$___ /mnt; echo OK; umount /mnt" \
# "01234 f512 a235567f-12a3-c123-a1b1-01234567abcb"
foreach_uuid_until() (
cd /dev/disk/by-uuid
+ [ "$1" = -p ] && local prefix="$2" && shift 2
local cmd="$1"; shift; local uuids_list="$*"
- local uuid; local full_uuid
+ local uuid; local full_uuid; local ___
[ -n "${cmd}" ] || return 1
for uuid in ${uuids_list:-*}; do
for full_uuid in ${uuid}*; do
[ -e "${full_uuid}" ] || continue
+ ___="${prefix}${full_uuid}"
eval ${cmd} && return 0
done
done
--
1.7.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified
@ 2010-11-12 1:09 Amadeusz Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-12 1:09 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
New:
str_starts, str_replace
funiq - print new unique file name
mkuniqdir - create and print new unique dir
splitsep - splits given string 'str' with separator 'sep' into vars
udevmatch - create udev rule match for a device
Modified:
foreach_uuid_until - use $___ as a place holder
---
modules.d/99base/dracut-lib.sh | 137 +++++++++++++++++++++++++++++++++++++--
1 files changed, 130 insertions(+), 7 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 596dae2..f0c030b 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -6,6 +6,29 @@ strstr() {
[ "${1#*$2*}" != "$1" ]
}
+# returns OK if $1 contains $2 at the beginning
+str_starts() {
+ [ "${1#$2*}" != "$1" ]
+}
+
+# replaces all occurrences of 'search' in 'str' with 'replacement'
+#
+# str_replace str search replacement
+#
+# example:
+# str_replace ' one two three ' ' ' '_'
+str_replace() {
+ local in="$1"; local s="$2"; local r="$3"
+ local out=''
+
+ while strstr "${in}" "$s"; do
+ chop="${in%%$s*}"
+ out="${out}${chop# }$r"
+ in="${in#*$s}"
+ done
+ echo "${out}${in}"
+}
+
_getcmdline() {
local _line
unset _line
@@ -142,6 +165,34 @@ getoptcomma() {
return 1
}
+# Splits given string 'str' with separator 'sep' into variables 'var1', 'var2',
+# 'varN'. If number of fields is less than number of variables, remaining are
+# not set. If number of fields is greater than number of variables, the last
+# variable takes remaining fields. In short - it acts similary to 'read'.
+#
+# splitsep sep str var1 var2 varN
+#
+# example:
+# splitsep ':' 'foo:bar:baz' v1 v2
+# in result:
+# v1='foo', v2='bar:baz'
+#
+# TODO: ':' inside fields.
+splitsep() {
+ local sep="$1"; local str="$2"; shift 2
+ local tmp
+
+ while [ -n "$str" -a -n "$*" ]; do
+ tmp="${str%%:*}"
+ eval "$1=${tmp}"
+ str="${str#$tmp}"
+ str="${str#:}"
+ shift
+ done
+
+ return 0
+}
+
setdebug() {
if [ -z "$RDDEBUG" ]; then
if [ -e /proc/cmdline ]; then
@@ -337,32 +388,104 @@ ip_to_var() {
esac
}
-# Evaluate command for UUIDs either given as arguments for this function or all
+# Create udev rule match for a device with its device name, or the udev property
+# ID_FS_UUID or ID_FS_LABEL
+#
+# example:
+# udevmatch LABEL=boot
+# prints:
+# ENV{ID_FS_LABEL}="boot"
+#
+# TOOD: symlinks
+udevmatch() {
+ case "$1" in
+ UUID=????????-????-????-????-????????????|LABEL=*)
+ printf 'ENV{ID_FS_%s}=="%s"' "${1%%=*}" "${1#*=}"
+ ;;
+ UUID=*)
+ printf 'ENV{ID_FS_UUID}=="%s*"' "${1#*=}"
+ ;;
+ /dev/?*) printf 'KERNEL=="%s"' "${1#/dev/}" ;;
+ *) return 255 ;;
+ esac
+}
+
+# Prints unique path for potential file inside specified directory. It consists
+# of specified directory, prefix and number at the end which is incremented
+# until non-existing file is found.
+#
+# funiq dir prefix
+#
+# example:
+# # ls /mnt
+# cdrom0 cdrom1
+#
+# # funiq /mnt cdrom
+# /mnt/cdrom2
+funiq() {
+ local dir="$1"; local prefix="$2"
+ local i=0
+
+ [ -d "${dir}" ] || return 1
+
+ while [ -e "${dir}/${prefix}$i" ]; do
+ i=$(($i+1)) || return 1
+ done
+
+ echo "${dir}/${prefix}$i"
+}
+
+# Creates unique directory and prints its path. It's using funiq to generate
+# path.
+#
+# mkuniqdir subdir new_dir_name
+mkuniqdir() {
+ local dir="$1"; local prefix="$2"
+ local retdir; local retdir_new
+
+ [ -d "${dir}" ] || mkdir -p "${dir}" || return 1
+
+ retdir=$(funiq "${dir}" "${prefix}") || return 1
+ until mkdir "${retdir}" 2>/dev/null; do
+ retdir_new=$(funiq "${dir}" "${prefix}") || return 1
+ [ "$retdir_new" = "$retdir" ] && return 1
+ retdir="$retdir_new"
+ done
+
+ echo "${retdir}"
+}
+
+# Evaluates command for UUIDs either given as arguments for this function or all
# listed in /dev/disk/by-uuid. UUIDs doesn't have to be fully specified. If
-# beginning is given it is expanded to all matching UUIDs. To pass full UUID
-# to your command use '${full_uuid}'. Remember to escape '$'!
+# beginning is given it is expanded to all matching UUIDs. To pass full UUID to
+# your command use '$___' as a place holder. Remember to escape '$'!
+#
+# foreach_uuid_until [ -p prefix ] command UUIDs
#
-# $1 = command to be evaluated
-# $2 = list of UUIDs separated by space
+# prefix - string to put just before $___
+# command - command to be evaluated
+# UUIDs - list of UUIDs separated by space
#
# The function returns after *first successful evaluation* of the given command
# with status 0. If evaluation fails for every UUID function returns with
# status 1.
#
# Example:
-# foreach_uuid_until "mount -U \${full_uuid} /mnt; echo OK; umount /mnt" \
+# foreach_uuid_until "mount -U \$___ /mnt; echo OK; umount /mnt" \
# "01234 f512 a235567f-12a3-c123-a1b1-01234567abcb"
foreach_uuid_until() (
cd /dev/disk/by-uuid
+ [ "$1" = -p ] && local prefix="$2" && shift 2
local cmd="$1"; shift; local uuids_list="$*"
- local uuid; local full_uuid
+ local uuid; local full_uuid; local ___
[ -n "${cmd}" ] || return 1
for uuid in ${uuids_list:-*}; do
for full_uuid in ${uuid}*; do
[ -e "${full_uuid}" ] || continue
+ ___="${prefix}${full_uuid}"
eval ${cmd} && return 0
done
done
--
1.7.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified
@ 2010-11-12 9:21 Amadeusz Żołnowski
[not found] ` <1289553710-7568-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
0 siblings, 1 reply; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-12 9:21 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
New:
str_starts, str_replace
funiq - print new unique file name
mkuniqdir - create and print new unique dir
splitsep - splits given string 'str' with separator 'sep' into vars
udevmatch - create udev rule match for a device
Modified:
foreach_uuid_until - use $___ as a place holder
---
modules.d/99base/dracut-lib.sh | 137 +++++++++++++++++++++++++++++++++++++--
1 files changed, 130 insertions(+), 7 deletions(-)
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 596dae2..f0c030b 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -6,6 +6,29 @@ strstr() {
[ "${1#*$2*}" != "$1" ]
}
+# returns OK if $1 contains $2 at the beginning
+str_starts() {
+ [ "${1#$2*}" != "$1" ]
+}
+
+# replaces all occurrences of 'search' in 'str' with 'replacement'
+#
+# str_replace str search replacement
+#
+# example:
+# str_replace ' one two three ' ' ' '_'
+str_replace() {
+ local in="$1"; local s="$2"; local r="$3"
+ local out=''
+
+ while strstr "${in}" "$s"; do
+ chop="${in%%$s*}"
+ out="${out}${chop# }$r"
+ in="${in#*$s}"
+ done
+ echo "${out}${in}"
+}
+
_getcmdline() {
local _line
unset _line
@@ -142,6 +165,34 @@ getoptcomma() {
return 1
}
+# Splits given string 'str' with separator 'sep' into variables 'var1', 'var2',
+# 'varN'. If number of fields is less than number of variables, remaining are
+# not set. If number of fields is greater than number of variables, the last
+# variable takes remaining fields. In short - it acts similary to 'read'.
+#
+# splitsep sep str var1 var2 varN
+#
+# example:
+# splitsep ':' 'foo:bar:baz' v1 v2
+# in result:
+# v1='foo', v2='bar:baz'
+#
+# TODO: ':' inside fields.
+splitsep() {
+ local sep="$1"; local str="$2"; shift 2
+ local tmp
+
+ while [ -n "$str" -a -n "$*" ]; do
+ tmp="${str%%:*}"
+ eval "$1=${tmp}"
+ str="${str#$tmp}"
+ str="${str#:}"
+ shift
+ done
+
+ return 0
+}
+
setdebug() {
if [ -z "$RDDEBUG" ]; then
if [ -e /proc/cmdline ]; then
@@ -337,32 +388,104 @@ ip_to_var() {
esac
}
-# Evaluate command for UUIDs either given as arguments for this function or all
+# Create udev rule match for a device with its device name, or the udev property
+# ID_FS_UUID or ID_FS_LABEL
+#
+# example:
+# udevmatch LABEL=boot
+# prints:
+# ENV{ID_FS_LABEL}="boot"
+#
+# TOOD: symlinks
+udevmatch() {
+ case "$1" in
+ UUID=????????-????-????-????-????????????|LABEL=*)
+ printf 'ENV{ID_FS_%s}=="%s"' "${1%%=*}" "${1#*=}"
+ ;;
+ UUID=*)
+ printf 'ENV{ID_FS_UUID}=="%s*"' "${1#*=}"
+ ;;
+ /dev/?*) printf 'KERNEL=="%s"' "${1#/dev/}" ;;
+ *) return 255 ;;
+ esac
+}
+
+# Prints unique path for potential file inside specified directory. It consists
+# of specified directory, prefix and number at the end which is incremented
+# until non-existing file is found.
+#
+# funiq dir prefix
+#
+# example:
+# # ls /mnt
+# cdrom0 cdrom1
+#
+# # funiq /mnt cdrom
+# /mnt/cdrom2
+funiq() {
+ local dir="$1"; local prefix="$2"
+ local i=0
+
+ [ -d "${dir}" ] || return 1
+
+ while [ -e "${dir}/${prefix}$i" ]; do
+ i=$(($i+1)) || return 1
+ done
+
+ echo "${dir}/${prefix}$i"
+}
+
+# Creates unique directory and prints its path. It's using funiq to generate
+# path.
+#
+# mkuniqdir subdir new_dir_name
+mkuniqdir() {
+ local dir="$1"; local prefix="$2"
+ local retdir; local retdir_new
+
+ [ -d "${dir}" ] || mkdir -p "${dir}" || return 1
+
+ retdir=$(funiq "${dir}" "${prefix}") || return 1
+ until mkdir "${retdir}" 2>/dev/null; do
+ retdir_new=$(funiq "${dir}" "${prefix}") || return 1
+ [ "$retdir_new" = "$retdir" ] && return 1
+ retdir="$retdir_new"
+ done
+
+ echo "${retdir}"
+}
+
+# Evaluates command for UUIDs either given as arguments for this function or all
# listed in /dev/disk/by-uuid. UUIDs doesn't have to be fully specified. If
-# beginning is given it is expanded to all matching UUIDs. To pass full UUID
-# to your command use '${full_uuid}'. Remember to escape '$'!
+# beginning is given it is expanded to all matching UUIDs. To pass full UUID to
+# your command use '$___' as a place holder. Remember to escape '$'!
+#
+# foreach_uuid_until [ -p prefix ] command UUIDs
#
-# $1 = command to be evaluated
-# $2 = list of UUIDs separated by space
+# prefix - string to put just before $___
+# command - command to be evaluated
+# UUIDs - list of UUIDs separated by space
#
# The function returns after *first successful evaluation* of the given command
# with status 0. If evaluation fails for every UUID function returns with
# status 1.
#
# Example:
-# foreach_uuid_until "mount -U \${full_uuid} /mnt; echo OK; umount /mnt" \
+# foreach_uuid_until "mount -U \$___ /mnt; echo OK; umount /mnt" \
# "01234 f512 a235567f-12a3-c123-a1b1-01234567abcb"
foreach_uuid_until() (
cd /dev/disk/by-uuid
+ [ "$1" = -p ] && local prefix="$2" && shift 2
local cmd="$1"; shift; local uuids_list="$*"
- local uuid; local full_uuid
+ local uuid; local full_uuid; local ___
[ -n "${cmd}" ] || return 1
for uuid in ${uuids_list:-*}; do
for full_uuid in ${uuid}*; do
[ -e "${full_uuid}" ] || continue
+ ___="${prefix}${full_uuid}"
eval ${cmd} && return 0
done
done
--
1.7.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg
[not found] ` <1289553710-7568-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
@ 2010-11-12 9:21 ` Amadeusz Żołnowski
[not found] ` <1289553710-7568-2-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2010-11-12 13:52 ` [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified Harald Hoyer
1 sibling, 1 reply; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-12 9:21 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
New kernel argument syntax for LUKS-keydev is introduced:
rd.luks.key=<key_path>[:<key_dev>[:<luks_dev>]]
Unfolding <key_dev> in BNF:
<key_dev> ::= "UUID=" <uuid> | "LABEL=" <label> | <kname>
Where <kname> matches following regular expression:
^/dev/.*
<kname> need to be a character device and not a symlink for now.
For every rd.luks.key argument udev rule is created. That rule runs
test to check whether matching device contains <key_path>. If it does
it's applied to matching <luks_dev>.
---
modules.d/90crypt/crypt-lib.sh | 119 ++++++++++++++++++++++++++++++++++++
modules.d/90crypt/cryptroot-ask.sh | 79 ++++++------------------
modules.d/90crypt/install | 5 ++
modules.d/90crypt/parse-crypt.sh | 8 +--
modules.d/90crypt/parse-keydev.sh | 41 ++++++++++++
modules.d/90crypt/probe-keydev.sh | 15 +++++
6 files changed, 201 insertions(+), 66 deletions(-)
create mode 100644 modules.d/90crypt/crypt-lib.sh
create mode 100644 modules.d/90crypt/parse-keydev.sh
create mode 100755 modules.d/90crypt/probe-keydev.sh
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
new file mode 100644
index 0000000..eee60fb
--- /dev/null
+++ b/modules.d/90crypt/crypt-lib.sh
@@ -0,0 +1,119 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+. /lib/dracut-lib.sh
+
+# Try to mount specified device (by path, by UUID or by label) and check
+# the path with 'test'.
+#
+# example:
+# test_dev -f LABEL="nice label" /some/file1
+test_dev() {
+ local test_op=$1; local dev="$2"; local f="$3"
+ local ret=1; local mount_point=$(mkuniqdir /mnt testdev)
+ local path
+
+ [ -n "$dev" -a -n "$*" ] || return 1
+ [ -d "$mount_point" ] || die 'Mount point does not exist!'
+
+ if mount -r "$dev" "$mount_point" >/dev/null 2>&1; then
+ test $test_op "${mount_point}/${f}"
+ ret=$?
+ umount "$mount_point"
+ fi
+
+ rmdir "$mount_point"
+
+ return $ret
+}
+
+# Get kernel name for given device. Device may be the name too (then the same
+# is returned), a symlink (full path), UUID (prefixed with "UUID=") or label
+# (prefixed with "LABEL="). If just a beginning of the UUID is specified or
+# even an empty, function prints all device names which UUIDs match - every in
+# single line.
+#
+# NOTICE: The name starts with "/dev/".
+#
+# Example:
+# devnames UUID=123
+# May print:
+# /dev/dm-1
+# /dev/sdb1
+# /dev/sdf3
+devnames() {
+ local dev="$1"; local d; local names
+
+ case "$dev" in
+ UUID=*)
+ dev="$(foreach_uuid_until '! blkid -U $___' "${dev#UUID=}")" \
+ && return 255
+ [ -z "$dev" ] && return 255
+ ;;
+ LABEL=*) dev="$(blkid -L "${dev#LABEL=}")" || return 255 ;;
+ /dev/?*) ;;
+ *) return 255 ;;
+ esac
+
+ for d in $dev; do
+ names="$names
+$(readlink -e -q "$d")" || return 255
+ done
+
+ echo "${names#
+}"
+}
+
+# match_dev devpattern dev
+#
+# Returns true if 'dev' matches 'devpattern'. Both 'devpattern' and 'dev' are
+# expanded to kernel names and then compared. If name of 'dev' is on list of
+# names of devices matching 'devpattern', the test is positive. 'dev' and
+# 'devpattern' may be anything which function 'devnames' recognizes.
+#
+# If 'devpattern' is empty or '*' then function just returns true.
+#
+# Example:
+# match_dev UUID=123 /dev/dm-1
+# Returns true if /dev/dm-1 UUID starts with "123".
+match_dev() {
+ [ -z "$1" -o "$1" = '*' ] && return 0
+ local devlist; local dev
+
+ devlist="$(devnames "$1")" || return 255
+ dev="$(devnames "$2")" || return 255
+
+ strstr "
+$devlist
+" "
+$dev
+"
+}
+
+# getkey keysfile for_dev
+#
+# 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
+# "<keydev>|<keypath>". When nothing found, just false is returned.
+#
+# Example:
+# getkey /tmp/luks.keys /dev/sdb1
+# May print:
+# /dev/sdc1|/keys/some.key
+getkey() {
+ local keys_file="$1"; local for_dev="$2"
+ local luks_dev; local key_dev; local key_path
+
+ [ -z "$keys_file" -o -z "$for_dev" ] && die 'getkey: wrong usage!'
+ [ -f "$keys_file" ] || return 1
+
+ while IFS='|' read luks_dev key_dev key_path; do
+ if match_dev "$luks_dev" "$for_dev"; then
+ echo "${key_dev}|${key_path}"
+ return 0
+ fi
+ done < "$keys_file"
+
+ return 1
+}
diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
index 6c3acb6..bb8e81e 100755
--- a/modules.d/90crypt/cryptroot-ask.sh
+++ b/modules.d/90crypt/cryptroot-ask.sh
@@ -14,7 +14,7 @@
# load dm_crypt if it is not already loaded
[ -d /sys/module/dm_crypt ] || modprobe dm_crypt
-. /lib/dracut-lib.sh
+. /lib/dracut-crypt-lib.sh
# default luksname - luks-UUID
luksname=$2
@@ -26,6 +26,7 @@ else
device="$1"
fi
+# TODO: improve to support what cmdline does
if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
while read name dev rest; do
# ignore blank lines and comments
@@ -54,72 +55,30 @@ if [ -f /etc/crypttab ] && getargbool 1 rd.luks.crypttab -n rd_NO_CRYPTTAB; then
fi
#
-# Search key on external devices
-#
-
-# Try to mount device specified by UUID and probe for existence of any of
-# the paths. On success return 0 and print "<uuid> <first-existing-path>",
-# otherwise return 1.
-# Function leaves mount point created.
-probe_keydev() {
- local uuid="$1"; shift; local keypaths="$*"
- local ret=1; local mount_point=/mnt/keydev
- local path
-
- [ -n "${uuid}" -a -n "${keypaths}" ] || return 1
- [ -d ${mount_point} ] || mkdir -p "${mount_point}" || return 1
-
- if mount -r -U "${uuid}" "${mount_point}" 2>/dev/null >/dev/null; then
- for path in ${keypaths}; do
- if [ -f "${mount_point}/${path}" ]; then
- echo "${uuid} ${path}"
- ret=0
- break
- fi
- done
- fi
-
- umount "${mount_point}" 2>/dev/null >/dev/null
-
- return ${ret}
-}
-
-keypaths="$(getargs rd.luks.keypath rd_LUKS_KEYPATH)"
-unset keydev_uuid keypath
-
-if [ -n "$keypaths" ]; then
- keydev_uuids="$(getargs rd.luks.keydev.uuid rd_LUKS_KEYDEV_UUID)"
- [ -n "$keydev_uuids" ] || {
- warn 'No UUID of device storing LUKS key specified.'
- warn 'It is recommended to set rd_LUKS_KEYDEV_UUID.'
- warn 'Performing scan of *all* devices accessible by UUID...'
- }
- tmp=$(foreach_uuid_until "probe_keydev \$full_uuid $keypaths" \
- $keydev_uuids) && {
- keydev_uuid="${tmp%% *}"
- keypath="${tmp#* }"
- } || {
- warn "Key for $device not found."
- }
- unset tmp keydev_uuids
-fi
-
-unset keypaths
-
-#
# Open LUKS device
#
info "luksOpen $device $luksname"
-if [ -n "$keydev_uuid" ]; then
- mntp=/mnt/keydev
- mkdir -p "$mntp"
- mount -r -U "$keydev_uuid" "$mntp"
+if [ -n "$(getarg rd.luks.key)" ]; then
+ if tmp=$(getkey /tmp/luks.keys $device); then
+ keydev="${tmp%%|*}"
+ keypath="${tmp#*|}"
+ else
+ info "No key found for $device. Will try later."
+ /sbin/initqueue --unique --onetime --settled \
+ --name cryptroot-ask-$luksname \
+ /sbin/cryptroot-ask "$@"
+ exit 0
+ fi
+ unset tmp
+
+ mntp=$(mkuniqdir /mnt keydev)
+ mount -r "$keydev" "$mntp" || die 'Mounting rem. dev. failed!'
cryptsetup -d "$mntp/$keypath" luksOpen "$device" "$luksname"
umount "$mntp"
- rmdir -p "$mntp" 2>/dev/null
- unset mntp keypath keydev_uuid
+ rmdir "$mntp"
+ unset mntp keypath keydev
else
# Prompt for password with plymouth, if installed.
# Should we check if plymouthd is running?
diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index a518bc3..12b3555 100755
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -2,7 +2,12 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
inst cryptsetup
+inst rmdir
+inst readlink
inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
+inst "$moddir"/probe-keydev.sh /sbin/probe-keydev
+inst_hook cmdline 10 "$moddir/parse-keydev.sh"
inst_hook cmdline 30 "$moddir/parse-crypt.sh"
inst_hook pre-pivot 30 "$moddir/crypt-cleanup.sh"
inst /etc/crypttab
+inst "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
index 3baad5f..0dca0d3 100755
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -11,10 +11,6 @@ else
} > /etc/udev/rules.d/70-luks.rules
LUKS=$(getargs rd.luks.uuid rd_LUKS_UUID)
- unset settled
- [ -n "$(getargs rd.luks.keypath rd_LUKS_KEYPATH)" ] && \
- [ -z "$(getargs rd.luks.keydev.uuid rd_LUKS_KEYDEV_UUID)" ] && \
- settled='--settled'
if [ -n "$LUKS" ]; then
for luksid in $LUKS; do
@@ -22,7 +18,7 @@ else
{
printf 'ENV{ID_FS_TYPE}=="crypto_LUKS", '
printf 'ENV{ID_FS_UUID}=="*%s*", ' $luksid
- printf 'RUN+="/sbin/initqueue --unique --onetime %s ' "$settled"
+ printf 'RUN+="/sbin/initqueue --unique --onetime '
printf -- '--name cryptroot-ask-%%k /sbin/cryptroot-ask '
printf '$env{DEVNAME} luks-$env{ID_FS_UUID}"\n'
} >> /etc/udev/rules.d/70-luks.rules
@@ -35,7 +31,7 @@ else
} >> /emergency/00-crypt.sh
done
else
- echo 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue' $settled \
+ echo 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/sbin/initqueue' \
'--unique --onetime --name cryptroot-ask-%k' \
'/sbin/cryptroot-ask $env{DEVNAME} luks-$env{ID_FS_UUID}"' \
>> /etc/udev/rules.d/70-luks.rules
diff --git a/modules.d/90crypt/parse-keydev.sh b/modules.d/90crypt/parse-keydev.sh
new file mode 100644
index 0000000..8712a46
--- /dev/null
+++ b/modules.d/90crypt/parse-keydev.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+if getargbool 1 rd.luks -n rd_NO_LUKS && \
+ [ -n "$(getarg rd.luks.key)" ]; then
+ exec 7>/etc/udev/rules.d/65-luks-keydev.rules
+ echo 'SUBSYSTEM!="block", GOTO="luks_keydev_end"' >&7
+ echo 'ACTION!="add|change", GOTO="luks_keydev_end"' >&7
+
+ for arg in $(getargs rd.luks.key); do
+ unset keypath keydev luksdev
+ splitsep : "$arg" keypath keydev luksdev
+
+ info "rd.luks.key: keypath='$keypath' keydev='$keydev' luksdev='$luksdev'"
+
+ if [ -z "$keypath" ]; then
+ warn 'keypath required!'
+ continue
+ fi
+
+ if [ -n "$keydev" ]; then
+ udevmatch "$keydev" >&7 || {
+ warn 'keydev incorrect!'
+ continue
+ }
+ printf ', ' >&7
+ fi
+
+ {
+ printf 'RUN+="/sbin/initqueue --unique --onetime '
+ printf -- '--name probe-keydev-%%k '
+ printf '/sbin/probe-keydev /dev/%%k %s %s"\n' \
+ "${keypath}" "${luksdev}"
+ } >&7
+ done
+ unset arg keypath keydev luksdev
+
+ echo 'LABEL="luks_keydev_end"' >&7
+ exec 7>&-
+fi
diff --git a/modules.d/90crypt/probe-keydev.sh b/modules.d/90crypt/probe-keydev.sh
new file mode 100755
index 0000000..8fdbc1a
--- /dev/null
+++ b/modules.d/90crypt/probe-keydev.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. /lib/dracut-crypt-lib.sh
+
+
+real_keydev="$1"; keypath="$2"; luksdev="$3"
+
+[ -z "$real_keydev" -o -z "$keypath" ] && die 'probe-keydev: wrong usage!'
+[ -z "$luksdev" ] && luksdev='*'
+
+info "Probing $real_keydev for $keypath..."
+test_dev -f "$real_keydev" "$keypath" || exit 1
+
+info "Found $keypath on $real_keydev"
+echo "$luksdev|$real_keydev|$keypath" >> /tmp/luks.keys
--
1.7.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] dracut.kernel.7: updated to latest changes in 90crypt
[not found] ` <1289553710-7568-2-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
@ 2010-11-12 9:21 ` Amadeusz Żołnowski
2010-11-13 8:50 ` [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg Andrey Borzenkov
1 sibling, 0 replies; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-12 9:21 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
---
dracut.kernel.7.xml | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml
index 7f54e9e..bf517ea 100644
--- a/dracut.kernel.7.xml
+++ b/dracut.kernel.7.xml
@@ -318,25 +318,20 @@ This parameter can be specified multiple times.</para>
</variablelist>
</refsect2>
<refsect2>
- <title>crypt LUKS - experimental removable keys support</title>
- <para>works only when plymouth module is not included</para>
+ <title>crypto LUKS - key on removable device support</title>
<variablelist>
<varlistentry>
<term>
- <envar>rd.luks.keypath=</envar>
- <replaceable><path to keyfile></replaceable>
+ <envar>rd.luks.key=</envar>
+ <replaceable><keypath>:<keydev>:<luksdev></replaceable>
</term>
<listitem>
- <para>path to keyfile inside remove device filesystem</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <envar>rd.luks.keydev.uuid=</envar>
- <replaceable><rem. device uuid></replaceable>
- </term>
- <listitem>
- <para>UUID of removalbe device storing keyfile; UUID doesn't have to be exact just like for <envar>rd.luks.uuid</envar></para>
+ <para><replaceable>keypath</replaceable> is a path to key file to look for. It's REQUIRED.</para>
+ <para><replaceable>keydev</replaceable> is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time.</para>
+ <para>If <replaceable>luksdev</replaceable> is given, the specified key will only be applied for that LUKS device. Possible values are the same as for <replaceable>keydev</replaceable>. Unless you have several LUKS devices, you don't have to specify this parameter.</para>
+ <para>The simplest usage is:</para>
+ <programlisting>rd.luks.key=/foo/bar.key</programlisting>
+ <para>As you see, you can skip colons in such case.</para>
</listitem>
</varlistentry>
</variablelist>
--
1.7.3.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified
[not found] ` <1289553710-7568-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2010-11-12 9:21 ` [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg Amadeusz Żołnowski
@ 2010-11-12 13:52 ` Harald Hoyer
1 sibling, 0 replies; 10+ messages in thread
From: Harald Hoyer @ 2010-11-12 13:52 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
Am 12.11.2010 10:21, schrieb Amadeusz Żołnowski:
> New:
> str_starts, str_replace
> funiq - print new unique file name
> mkuniqdir - create and print new unique dir
> splitsep - splits given string 'str' with separator 'sep' into vars
> udevmatch - create udev rule match for a device
>
> Modified:
> foreach_uuid_until - use $___ as a place holder
> ---
> modules.d/99base/dracut-lib.sh | 137 +++++++++++++++++++++++++++++++++++++--
> 1 files changed, 130 insertions(+), 7 deletions(-)
>
> diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
> index 596dae2..f0c030b 100755
> --- a/modules.d/99base/dracut-lib.sh
> +++ b/modules.d/99base/dracut-lib.sh
> @@ -6,6 +6,29 @@ strstr() {
> [ "${1#*$2*}" != "$1" ]
> }
>
> +# returns OK if $1 contains $2 at the beginning
> +str_starts() {
> + [ "${1#$2*}" != "$1" ]
> +}
> +
> +# replaces all occurrences of 'search' in 'str' with 'replacement'
> +#
> +# str_replace str search replacement
> +#
> +# example:
> +# str_replace ' one two three ' ' ' '_'
> +str_replace() {
> + local in="$1"; local s="$2"; local r="$3"
> + local out=''
> +
> + while strstr "${in}" "$s"; do
> + chop="${in%%$s*}"
> + out="${out}${chop# }$r"
> + in="${in#*$s}"
> + done
> + echo "${out}${in}"
> +}
> +
> _getcmdline() {
> local _line
> unset _line
> @@ -142,6 +165,34 @@ getoptcomma() {
> return 1
> }
>
> +# Splits given string 'str' with separator 'sep' into variables 'var1', 'var2',
> +# 'varN'. If number of fields is less than number of variables, remaining are
> +# not set. If number of fields is greater than number of variables, the last
> +# variable takes remaining fields. In short - it acts similary to 'read'.
> +#
> +# splitsep sep str var1 var2 varN
> +#
> +# example:
> +# splitsep ':' 'foo:bar:baz' v1 v2
> +# in result:
> +# v1='foo', v2='bar:baz'
> +#
> +# TODO: ':' inside fields.
> +splitsep() {
> + local sep="$1"; local str="$2"; shift 2
> + local tmp
> +
> + while [ -n "$str" -a -n "$*" ]; do
> + tmp="${str%%:*}"
> + eval "$1=${tmp}"
> + str="${str#$tmp}"
> + str="${str#:}"
> + shift
> + done
> +
> + return 0
> +}
> +
> setdebug() {
> if [ -z "$RDDEBUG" ]; then
> if [ -e /proc/cmdline ]; then
> @@ -337,32 +388,104 @@ ip_to_var() {
> esac
> }
>
> -# Evaluate command for UUIDs either given as arguments for this function or all
> +# Create udev rule match for a device with its device name, or the udev property
> +# ID_FS_UUID or ID_FS_LABEL
> +#
> +# example:
> +# udevmatch LABEL=boot
> +# prints:
> +# ENV{ID_FS_LABEL}="boot"
> +#
> +# TOOD: symlinks
> +udevmatch() {
> + case "$1" in
> + UUID=????????-????-????-????-????????????|LABEL=*)
> + printf 'ENV{ID_FS_%s}=="%s"' "${1%%=*}" "${1#*=}"
> + ;;
> + UUID=*)
> + printf 'ENV{ID_FS_UUID}=="%s*"' "${1#*=}"
> + ;;
> + /dev/?*) printf 'KERNEL=="%s"' "${1#/dev/}" ;;
> + *) return 255 ;;
> + esac
> +}
> +
> +# Prints unique path for potential file inside specified directory. It consists
> +# of specified directory, prefix and number at the end which is incremented
> +# until non-existing file is found.
> +#
> +# funiq dir prefix
> +#
> +# example:
> +# # ls /mnt
> +# cdrom0 cdrom1
> +#
> +# # funiq /mnt cdrom
> +# /mnt/cdrom2
> +funiq() {
> + local dir="$1"; local prefix="$2"
> + local i=0
> +
> + [ -d "${dir}" ] || return 1
> +
> + while [ -e "${dir}/${prefix}$i" ]; do
> + i=$(($i+1)) || return 1
> + done
> +
> + echo "${dir}/${prefix}$i"
> +}
> +
> +# Creates unique directory and prints its path. It's using funiq to generate
> +# path.
> +#
> +# mkuniqdir subdir new_dir_name
> +mkuniqdir() {
> + local dir="$1"; local prefix="$2"
> + local retdir; local retdir_new
> +
> + [ -d "${dir}" ] || mkdir -p "${dir}" || return 1
> +
> + retdir=$(funiq "${dir}" "${prefix}") || return 1
> + until mkdir "${retdir}" 2>/dev/null; do
> + retdir_new=$(funiq "${dir}" "${prefix}") || return 1
> + [ "$retdir_new" = "$retdir" ]&& return 1
> + retdir="$retdir_new"
> + done
> +
> + echo "${retdir}"
> +}
> +
> +# Evaluates command for UUIDs either given as arguments for this function or all
> # listed in /dev/disk/by-uuid. UUIDs doesn't have to be fully specified. If
> -# beginning is given it is expanded to all matching UUIDs. To pass full UUID
> -# to your command use '${full_uuid}'. Remember to escape '$'!
> +# beginning is given it is expanded to all matching UUIDs. To pass full UUID to
> +# your command use '$___' as a place holder. Remember to escape '$'!
> +#
> +# foreach_uuid_until [ -p prefix ] command UUIDs
> #
> -# $1 = command to be evaluated
> -# $2 = list of UUIDs separated by space
> +# prefix - string to put just before $___
> +# command - command to be evaluated
> +# UUIDs - list of UUIDs separated by space
> #
> # The function returns after *first successful evaluation* of the given command
> # with status 0. If evaluation fails for every UUID function returns with
> # status 1.
> #
> # Example:
> -# foreach_uuid_until "mount -U \${full_uuid} /mnt; echo OK; umount /mnt" \
> +# foreach_uuid_until "mount -U \$___ /mnt; echo OK; umount /mnt" \
> # "01234 f512 a235567f-12a3-c123-a1b1-01234567abcb"
> foreach_uuid_until() (
> cd /dev/disk/by-uuid
>
> + [ "$1" = -p ]&& local prefix="$2"&& shift 2
> local cmd="$1"; shift; local uuids_list="$*"
> - local uuid; local full_uuid
> + local uuid; local full_uuid; local ___
>
> [ -n "${cmd}" ] || return 1
>
> for uuid in ${uuids_list:-*}; do
> for full_uuid in ${uuid}*; do
> [ -e "${full_uuid}" ] || continue
> + ___="${prefix}${full_uuid}"
> eval ${cmd}&& return 0
> done
> done
pushed all three
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg
[not found] ` <1289553710-7568-2-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2010-11-12 9:21 ` [PATCH 3/3] dracut.kernel.7: updated to latest changes in 90crypt Amadeusz Żołnowski
@ 2010-11-13 8:50 ` Andrey Borzenkov
[not found] ` <AANLkTimg81mVgKeJ93y_J52Kud_NaUSB6RLT3wFst7fN-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
1 sibling, 1 reply; 10+ messages in thread
From: Andrey Borzenkov @ 2010-11-13 8:50 UTC (permalink / raw)
To: Amadeusz Żołnowski; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
2010/11/12 Amadeusz ¯o³nowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
[...]
> diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
[...]
> inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
As you are currently working on it, could you look into making
cryptroot coexist with plymouth? Currently they fight for
/sbin/cryptroot-ask; I thought about adding minimal plugin support
(i.e. something like /cryptroot-ask.d where modules can drop their
implementation; they will be tried is sequence until some succeeds).
Then /sbin/cryptroot-ask could be moved to base and be simple wrapper
around this directory.
Unfortunately I do not currently have ready-to-use infrastructure to
test this implementation.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg
[not found] ` <AANLkTimg81mVgKeJ93y_J52Kud_NaUSB6RLT3wFst7fN-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2010-11-15 16:42 ` Amadeusz Żołnowski
2010-11-15 16:50 ` Andrey Borzenkov
0 siblings, 1 reply; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-15 16:42 UTC (permalink / raw)
To: Andrey Borzenkov; +Cc: initramfs
[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]
Excerpts from Andrey Borzenkov's message of Sat Nov 13 09:50:54 +0100 2010:
> 2010/11/12 Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
> [...]
> > diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
> [...]
> > inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
>
> As you are currently working on it, could you look into making
> cryptroot coexist with plymouth? Currently they fight for
> /sbin/cryptroot-ask; I thought about adding minimal plugin support
> (i.e. something like /cryptroot-ask.d where modules can drop their
> implementation; they will be tried is sequence until some succeeds).
> Then /sbin/cryptroot-ask could be moved to base and be simple wrapper
> around this directory.
>
> Unfortunately I do not currently have ready-to-use infrastructure to
> test this implementation.
OK. Thanks for reporting that. Matt Smith has already merged
cryptroot-ask from plymouth to crypt module and it worked well until
that my new patch. I'll try to fix the problem.
--
Amadeusz Żołnowski
PGP key fpr: C700 CEDE 0C18 212E 49DA 4653 F013 4531 E1DB FAB5
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg
2010-11-15 16:42 ` Amadeusz Żołnowski
@ 2010-11-15 16:50 ` Andrey Borzenkov
[not found] ` <AANLkTin4CecwByk3-EkGQHOGNN3=jrnjwWrh4YzEzC9Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 10+ messages in thread
From: Andrey Borzenkov @ 2010-11-15 16:50 UTC (permalink / raw)
To: Amadeusz Żołnowski; +Cc: initramfs
2010/11/15 Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
> Excerpts from Andrey Borzenkov's message of Sat Nov 13 09:50:54 +0100 2010:
>> 2010/11/12 Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
>> [...]
>> > diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
>> [...]
>> > inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
>>
>> As you are currently working on it, could you look into making
>> cryptroot coexist with plymouth? Currently they fight for
>> /sbin/cryptroot-ask; I thought about adding minimal plugin support
>> (i.e. something like /cryptroot-ask.d where modules can drop their
>> implementation; they will be tried is sequence until some succeeds).
>> Then /sbin/cryptroot-ask could be moved to base and be simple wrapper
>> around this directory.
>>
>> Unfortunately I do not currently have ready-to-use infrastructure to
>> test this implementation.
>
> OK. Thanks for reporting that. Matt Smith has already merged
> cryptroot-ask from plymouth to crypt module and it worked well until
> that my new patch. I'll try to fix the problem.
Actually I missed this patch, sorry. I'm still not sure how it behaves
if plymouth binary is available but plymouthd itself is not active/not
showing splash.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg
[not found] ` <AANLkTin4CecwByk3-EkGQHOGNN3=jrnjwWrh4YzEzC9Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2010-11-15 17:06 ` Amadeusz Żołnowski
0 siblings, 0 replies; 10+ messages in thread
From: Amadeusz Żołnowski @ 2010-11-15 17:06 UTC (permalink / raw)
To: Andrey Borzenkov; +Cc: initramfs
[-- Attachment #1: Type: text/plain, Size: 1928 bytes --]
Excerpts from Andrey Borzenkov's message of Mon Nov 15 17:50:50 +0100 2010:
> 2010/11/15 Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
> > Excerpts from Andrey Borzenkov's message of Sat Nov 13 09:50:54 +0100 2010:
> >> 2010/11/12 Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>:
> >> [...]
> >> > diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
> >> [...]
> >> > inst "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
> >>
> >> As you are currently working on it, could you look into making
> >> cryptroot coexist with plymouth? Currently they fight for
> >> /sbin/cryptroot-ask; I thought about adding minimal plugin support
> >> (i.e. something like /cryptroot-ask.d where modules can drop their
> >> implementation; they will be tried is sequence until some succeeds).
> >> Then /sbin/cryptroot-ask could be moved to base and be simple wrapper
> >> around this directory.
> >>
> >> Unfortunately I do not currently have ready-to-use infrastructure to
> >> test this implementation.
> >
> > OK. Thanks for reporting that. Matt Smith has already merged
> > cryptroot-ask from plymouth to crypt module and it worked well until
> > that my new patch. I'll try to fix the problem.
>
> Actually I missed this patch, sorry. I'm still not sure how it behaves
> if plymouth binary is available but plymouthd itself is not active/not
> showing splash.
Just look at the commit 7254c24a76d5f5afe4168d513a00756dc85cb460.
Even with my new patch splash shows up. The problem which appears with
my patch is that when you do rdbreak, boot process terminates as it
should, drops to shell and… console hangs (the last is the "feature"
which appears with keydev; I'll investigate on it as soon as will have
some time).
--
Amadeusz Żołnowski
PGP key fpr: C700 CEDE 0C18 212E 49DA 4653 F013 4531 E1DB FAB5
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-11-15 17:06 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-12 9:21 [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified Amadeusz Żołnowski
[not found] ` <1289553710-7568-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2010-11-12 9:21 ` [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg Amadeusz Żołnowski
[not found] ` <1289553710-7568-2-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2010-11-12 9:21 ` [PATCH 3/3] dracut.kernel.7: updated to latest changes in 90crypt Amadeusz Żołnowski
2010-11-13 8:50 ` [PATCH 2/3] 90crypt: probe for keydev asynchronously; changed kernel arg Andrey Borzenkov
[not found] ` <AANLkTimg81mVgKeJ93y_J52Kud_NaUSB6RLT3wFst7fN-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-15 16:42 ` Amadeusz Żołnowski
2010-11-15 16:50 ` Andrey Borzenkov
[not found] ` <AANLkTin4CecwByk3-EkGQHOGNN3=jrnjwWrh4YzEzC9Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-11-15 17:06 ` Amadeusz Żołnowski
2010-11-12 13:52 ` [PATCH 1/3] 99base/dracut-lib.sh: 5 new functions & 1 modified Harald Hoyer
-- strict thread matches above, loose matches on Subject: below --
2010-11-12 1:09 Amadeusz Żołnowski
2010-11-11 23:59 Amadeusz Żołnowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox