9fd4bf22aa
- dracut.sh: check for logfile (--logfile option) and create it if necessary Add 0139-dracut.sh-check-for-logfile-logfile-option-and-creat.patch - Avoid duplicate names in host_devs Add 0140-dracut.sh-Avoid-duplicate-devices-in-host_devs.patch - iscsi: Avoid bad ip route call on empty address Add 0141-iscsi-Avoid-bad-ip-route-call-on-empty-address.patch - 40network: Don't report error for .../ifroute-* during module setup Add 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch - iscsi: Fix up ipv6 in brackets , iterate over all needed iscsi mounts Add 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch - 90crypt: Fixed crypttab_contains() to also work with device in /etc/crypttab Add 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch - 40network: handle 'ip=ifname:static' correctly (bnc#892801) Add 0145-40network-handle-ip-ifname-static-correctly.patch OBS-URL: https://build.opensuse.org/request/show/245581 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=180
77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
From 7f4dea242398cc369ff3fecd599faa00d81a522c Mon Sep 17 00:00:00 2001
|
|
From: Julian Wolf <juwolf@suse.de>
|
|
Date: Tue, 19 Aug 2014 16:23:59 +0200
|
|
Subject: 90crypt: Fixed crypttab_contains() to also work with device path in
|
|
/etc/crypttab
|
|
|
|
blkid is not available when this function is called, so block_uuid.map is put into
|
|
the initrd, mapping block devices from /etc/crypttab to UUIDs.
|
|
|
|
This fixes a bug where udev rules were created by mistake as crypttab_contains()
|
|
returned false for devices specified by path in /etc/crypttab which resulted in
|
|
error messages during boot.
|
|
|
|
Signed-off-by: Julian Wolf <juwolf@suse.de>
|
|
---
|
|
modules.d/90crypt/crypt-lib.sh | 9 +++++++++
|
|
modules.d/90crypt/module-setup.sh | 4 ++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
|
|
index f48397d..fe72914 100755
|
|
--- a/modules.d/90crypt/crypt-lib.sh
|
|
+++ b/modules.d/90crypt/crypt-lib.sh
|
|
@@ -7,11 +7,20 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh
|
|
# check if the crypttab contains an entry for a LUKS UUID
|
|
crypttab_contains() {
|
|
local luks="$1"
|
|
+ local _uuid _line
|
|
local l d rest
|
|
if [ -f /etc/crypttab ]; then
|
|
while read l d rest; do
|
|
strstr "${l##luks-}" "${luks##luks-}" && return 0
|
|
strstr "$d" "${luks##luks-}" && return 0
|
|
+ if [ -e /usr/lib/dracut/modules.d/90crypt/block_uuid.map ]; then
|
|
+ # search for line starting with $d
|
|
+ _line=$(sed -n "\,^$d .*$,{p}" /usr/lib/dracut/modules.d/90crypt/block_uuid.map)
|
|
+ [ -z "$_line" ] && continue
|
|
+ # get second column with uuid
|
|
+ _uuid="$(echo $_line | sed 's,^.* \(.*$\),\1,')"
|
|
+ strstr "$_uuid" "${luks##luks-}" && return 0
|
|
+ fi
|
|
done < /etc/crypttab
|
|
fi
|
|
return 1
|
|
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
|
|
index e423a95..c79dbb8 100755
|
|
--- a/modules.d/90crypt/module-setup.sh
|
|
+++ b/modules.d/90crypt/module-setup.sh
|
|
@@ -65,6 +65,7 @@ install() {
|
|
inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
|
|
fi
|
|
|
|
+ > /tmp/dracut_block_uuid.map
|
|
if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
|
|
# filter /etc/crypttab for the devices we need
|
|
while read _mapper _dev _rest; do
|
|
@@ -74,6 +75,8 @@ install() {
|
|
[[ $_dev == UUID=* ]] && \
|
|
_dev="/dev/disk/by-uuid/${_dev#UUID=}"
|
|
|
|
+ echo "$_dev $(blkid $_dev -s UUID -o value)" >> /tmp/dracut_block_uuid.map
|
|
+
|
|
for _hdev in "${!host_fs_types[@]}"; do
|
|
[[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
|
|
if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then
|
|
@@ -85,6 +88,7 @@ install() {
|
|
fi
|
|
|
|
inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
|
|
+ inst_simple "/tmp/dracut_block_uuid.map" "/usr/lib/dracut/modules.d/90crypt/block_uuid.map"
|
|
|
|
inst_multiple -o \
|
|
$systemdutildir/system-generators/systemd-cryptsetup-generator \
|
|
--
|
|
1.8.4.5
|
|
|