[dracut/f14/master] - plymouth dracut module should only depend on crypt module, if cryptsetup exists Resolves: rhbz#6

[Harald Hoyer]

commit 5efcb143f63e4fbd2da312384e7a2b9b1ae6f35f
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Oct 13 14:56:39 2010 +0200

    - plymouth dracut module should only depend on crypt module,
      if cryptsetup exists
    Resolves: rhbz#642617

 ...outh-depend-on-crypt-if-cryptsetup-exists.patch |   15 +++++++++++++++
 dracut.spec                                        |   10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/0100-plymouth-depend-on-crypt-if-cryptsetup-exists.patch b/0100-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
new file mode 100644
index 0000000..c3cbaa0
--- /dev/null
+++ b/0100-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
@@ -0,0 +1,15 @@
+commit 5cae1fe179faea815e5adcca71645367829aee01
+Author: Harald Hoyer <harald at redhat.com>
+Date:   Fri Jul 9 11:19:32 2010 +0200
+
+    plymouth: depend on crypt, if cryptsetup exists
+
+diff --git a/modules.d/50plymouth/check b/modules.d/50plymouth/check
+index 838e7e2..ceb26a7 100755
+--- a/modules.d/50plymouth/check
++++ b/modules.d/50plymouth/check
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+-[[ $1 = -d ]] && echo crypt
++[[ $1 = -d ]] && which cryptsetup &>/dev/null && echo crypt
+ [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
diff --git a/dracut.spec b/dracut.spec
index e287341..c51cc3b 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -20,7 +20,7 @@
 
 Name: dracut
 Version: 006
-Release: 2%{?rdist}
+Release: 3%{?rdist}
 Summary: Initramfs generator using udev
 Group: System Environment/Base          
 License: GPLv2+ 
@@ -37,6 +37,7 @@ Patch5: 0005-crypt-add-fpu-kernel-module.patch
 Patch6: 0006-Write-rules-for-symlinks-to-dev-.udev-rules.d-for-la.patch
 Patch7: 0007-dracut-functions-set-LANG-C-for-ldd-output-parsing.patch
 Patch8: 0008-dracut-functions-use-LC_ALL-C-rather-than-LANG-C.patch
+Patch100: 0100-plymouth-depend-on-crypt-if-cryptsetup-exists.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -144,7 +145,7 @@ This package contains tools to assemble the local initrd and host configuration.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-
+%patch100 -p1
 
 %build
 make WITH_SWITCH_ROOT=0%{?with_switch_root}
@@ -249,6 +250,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Wed Oct 13 2010 Harald Hoyer <harald at redhat.com> 006-3
+- plymouth dracut module should only depend on crypt module,
+  if cryptsetup exists
+Resolves: rhbz#642617
+
 * Wed Jun 23 2010 Harald Hoyer <harald at redhat.com> 006-2
 - bugfixes
 - preserve /dev/live symlink for real root