diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-10 10:18:32 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-10 10:18:32 +0200 |
| commit | b215c1349afe58940a3f7075494aa7021032778e (patch) | |
| tree | a166fe0f52b740eadcb8778a9a253f4b37cd4051 | |
| parent | ab11ed5290214e793ef6e6251f8d9c30ded85f33 (diff) | |
| download | dracut-b215c1349afe58940a3f7075494aa7021032778e.tar.gz dracut-b215c1349afe58940a3f7075494aa7021032778e.tar.xz dracut-b215c1349afe58940a3f7075494aa7021032778e.zip | |
dracut-027-19.git20130410
- also handle UUID= entries in crypttab in host-only mode
Resolves:rhbz#919752
| -rw-r--r-- | 0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch | 27 | ||||
| -rw-r--r-- | dracut.spec | 7 |
2 files changed, 33 insertions, 1 deletions
diff --git a/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch b/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch new file mode 100644 index 0000000..0fd2982 --- /dev/null +++ b/0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch @@ -0,0 +1,27 @@ +From cdcb27a4fee4400581becec37e862c461332cb50 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer <harald@redhat.com> +Date: Wed, 10 Apr 2013 10:15:43 +0200 +Subject: [PATCH] crypt/module-setup.sh: also handle UUID= while filtering + crypttab + +The crypttab filter for host-only did not handle UUID= entries. +https://bugzilla.redhat.com/show_bug.cgi?id=919752 +--- + modules.d/90crypt/module-setup.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh +index 3c9a1f1..639a77f 100755 +--- a/modules.d/90crypt/module-setup.sh ++++ b/modules.d/90crypt/module-setup.sh +@@ -62,6 +62,10 @@ install() { + while read _mapper _dev _rest; do + [[ $_mapper = \#* ]] && continue + [[ $_dev ]] || continue ++ ++ [[ $_dev == UUID=* ]] && \ ++ _dev="/dev/disk/by-uuid/${_dev#UUID=}" ++ + for _hdev in "${!host_fs_types[@]}"; do + [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue + if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then diff --git a/dracut.spec b/dracut.spec index 9ea57c6..205e53d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 027 -Release: 18.git20130409%{?dist} +Release: 19.git20130410%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -46,6 +46,7 @@ Patch14: 0014-network-support-multiple-bonding-interfaces.patch Patch15: 0015-Wait-for-logical-interface-to-be-up.patch Patch16: 0016-Let-user-specify-the-action-after-fail.patch Patch17: 0017-ifup.sh-Add-support-for-bridge-over-a-vlan-tagged-in.patch +Patch18: 0018-crypt-module-setup.sh-also-handle-UUID-while-filteri.patch BuildRequires: dash bash git @@ -455,6 +456,10 @@ rm -rf $RPM_BUILD_ROOT %{dracutlibdir}/dracut.conf.d/02-norescue.conf %changelog +* Wed Apr 10 2013 Harald Hoyer <harald@redhat.com> 027-19.git20130410 +- also handle UUID= entries in crypttab in host-only mode +Resolves:rhbz#919752 + * Tue Apr 09 2013 Harald Hoyer <harald@redhat.com> 027-17.git20130409 - only include needed /etc/crypttab entries Resolves:rhbz#919752 |