From f4f240a1f13582f5b63c5ac0c6a1cd07a0260fce Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 30 Jul 2012 22:32:07 +0200
Subject: [PATCH] removed install of missing finished-ask-password.sh

---
 0097-removed-finished-ask-password.sh.patch   | 20 +++++++++++++
 ...generator.sh-check-if-crypttab-exist.patch | 29 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 0097-removed-finished-ask-password.sh.patch
 create mode 100644 0098-crypt-crypt-run-generator.sh-check-if-crypttab-exist.patch

diff --git a/0097-removed-finished-ask-password.sh.patch b/0097-removed-finished-ask-password.sh.patch
new file mode 100644
index 0000000..2b7ddb1
--- /dev/null
+++ b/0097-removed-finished-ask-password.sh.patch
@@ -0,0 +1,20 @@
+From 92b3ee855f2db13577c04dba584739a10e62368a Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 30 Jul 2012 22:19:59 +0200
+Subject: [PATCH] removed finished-ask-password.sh
+
+---
+ modules.d/90crypt/module-setup.sh | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
+index b6d97af..485cbe0 100755
+--- a/modules.d/90crypt/module-setup.sh
++++ b/modules.d/90crypt/module-setup.sh
+@@ -59,6 +59,5 @@ install() {
+         $systemdsystemunitdir/cryptsetup.target \
+         $systemdsystemunitdir/sysinit.target.wants/cryptsetup.target \
+         systemd-ask-password systemd-tty-ask-password-agent
+-    inst_hook initqueue/finished 01 "$moddir/finished-ask-password.sh"
+     inst_script "$moddir"/crypt-run-generator.sh /sbin/crypt-run-generator
+ }
diff --git a/0098-crypt-crypt-run-generator.sh-check-if-crypttab-exist.patch b/0098-crypt-crypt-run-generator.sh-check-if-crypttab-exist.patch
new file mode 100644
index 0000000..5312962
--- /dev/null
+++ b/0098-crypt-crypt-run-generator.sh-check-if-crypttab-exist.patch
@@ -0,0 +1,29 @@
+From 3d3c192621861bb82966369d74300c504f6d786f Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 30 Jul 2012 22:27:53 +0200
+Subject: [PATCH] crypt/crypt-run-generator.sh: check if crypttab exists
+
+---
+ modules.d/90crypt/crypt-run-generator.sh | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
+index cb3aedc..f2f2da1 100755
+--- a/modules.d/90crypt/crypt-run-generator.sh
++++ b/modules.d/90crypt/crypt-run-generator.sh
+@@ -5,10 +5,11 @@
+ dev=$1
+ luks=$2
+ 
+-while read l rest; do
+-    strstr "${l##luks-}" "${luks##luks-}" && exit 0
+-done < /etc/crypttab
+-
++if [ -f /etc/crypttab ]; then
++    while read l rest; do
++        strstr "${l##luks-}" "${luks##luks-}" && exit 0
++    done < /etc/crypttab
++fi
+ 
+ echo "$luks $dev" >> /etc/crypttab
+ /lib/systemd/system-generators/systemd-cryptsetup-generator