dracut-027-19.git20130410

- also handle UUID= entries in crypttab in host-only mode
Resolves:rhbz#919752

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

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