From: Harald Hoyer <harald@redhat.com>
Date: Wed, 6 Mar 2013 15:22:42 +0000 (+0100)
Subject: crypt: do not cleanup in systemd mode
X-Git-Tag: 026~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9020221a734a5549d064508b60101fab84facb6;p=thirdparty%2Fdracut.git

crypt: do not cleanup in systemd mode
---

diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index 5c1c71bc4..93b996cd8 100755
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -46,7 +46,9 @@ install() {
     inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
     inst_hook cmdline 10 "$moddir/parse-keydev.sh"
     inst_hook cmdline 30 "$moddir/parse-crypt.sh"
-    inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
+    if ! dracut_module_included "systemd"; then
+        inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
+    fi
     [[ $hostonly ]]  && inst_simple /etc/crypttab
     inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
 
@@ -60,4 +62,5 @@ install() {
         $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \
         systemd-ask-password systemd-tty-ask-password-agent
     inst_script "$moddir"/crypt-run-generator.sh /sbin/crypt-run-generator
+    dracut_need_initqueue
 }