89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
74 lines
3.2 KiB
Diff
74 lines
3.2 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(+)
|
|
|
|
Index: dracut-042/modules.d/90crypt/crypt-lib.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/90crypt/crypt-lib.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ dracut-042/modules.d/90crypt/crypt-lib.sh 2015-06-24 18:02:28.878483104 +0200
|
|
@@ -5,11 +5,20 @@ command -v getarg >/dev/null || . /lib/d
|
|
# 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 || [ -n "$l" ]; 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
|
|
Index: dracut-042/modules.d/90crypt/module-setup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/90crypt/module-setup.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ dracut-042/modules.d/90crypt/module-setup.sh 2015-06-24 18:02:28.882483333 +0200
|
|
@@ -63,6 +63,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 || [ -n "$_mapper" ]; do
|
|
@@ -72,6 +73,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
|
|
@@ -84,6 +87,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 \
|