removed install of missing finished-ask-password.sh

This commit is contained in:
Harald Hoyer 2012-07-30 22:32:07 +02:00
parent 811c04a7e9
commit f4f240a1f1
2 changed files with 49 additions and 0 deletions

View File

@ -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
}

View File

@ -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