From dd10c29d12e2536436b377fff6eed9dc203a4044 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Wed, 20 May 2015 03:20:31 -0400
Subject: [PATCH] Clean up module-setup.sh

---
 src/plugins/askpassd/module-setup.sh.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/askpassd/module-setup.sh.in b/src/plugins/askpassd/module-setup.sh.in
index 8f271f4..5305014 100644
--- a/src/plugins/askpassd/module-setup.sh.in
+++ b/src/plugins/askpassd/module-setup.sh.in
@@ -10,8 +10,6 @@ check() {
     # If petera is not installed,
     # then we cannot support it
     require_binaries petera \
-        "$systemdsystemunitdir/petera-askpassd.service" \
-        "$systemdsystemunitdir/petera-askpassd.path" \
         @PETERA_PLUGINS@/askpassd.so \
         @PETERA_PLUGINS@/decrypt.so \
         || return 1
@@ -20,7 +18,7 @@ check() {
 }
 
 depends() {
-    echo crypt systemd
+    echo crypt systemd network
     return 0
 }
 
@@ -39,10 +37,11 @@ install() {
         "$systemdsystemunitdir/petera-askpassd.path" \
         @PETERA_PLUGINS@/askpassd.so \
         @PETERA_PLUGINS@/decrypt.so \
-        @PETERA_CONF@/disks.d
+        @PETERA_CONF@/disks.d/*
 
+    mkdir -p "$initdir/$systemdsystemunitdir/cryptsetup.target.wants"
     ln_r  "$systemdsystemunitdir/petera-askpassd.path" \
-        "$systemdsystemunitdir/basic.target.wants/petera-askpassd.path"
+        "$systemdsystemunitdir/cryptsetup.target.wants/petera-askpassd.path"
 
     dracut_need_initqueue
 }