From 590d34f183c9abc60068a767426edbfec30cda3e Mon Sep 17 00:00:00 2001
From: toni <matzeton@googlemail.com>
Date: Thu, 5 Feb 2015 11:05:32 +0100
Subject: init- script/hook rewrote:   - plymouth compatible   - cleaned up the
 initrd hook

---
 scripts/naskpass.initscript | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 scripts/naskpass.initscript

(limited to 'scripts/naskpass.initscript')

diff --git a/scripts/naskpass.initscript b/scripts/naskpass.initscript
old mode 100755
new mode 100644
index 1216e14..3f9be2c
--- a/scripts/naskpass.initscript
+++ b/scripts/naskpass.initscript
@@ -68,7 +68,7 @@ parse_options()
 	cryptlvm=""
 	cryptkeyscript=""
 	cryptkey="" # This is only used as an argument to an eventual keyscript
-	crypttries=1
+	crypttries=3
 	cryptrootdev=""
 	cryptdiscard=""
 	CRYPTTAB_OPTIONS=""
@@ -101,12 +101,23 @@ parse_options()
 		lvm=*)
 			cryptlvm=${x#lvm=}
 			;;
+		keyscript=*)
+			cryptkeyscript=${x#keyscript=}
+			;;
 		key=*)
 			if [ "${x#key=}" != "none" ]; then
 				cryptkey=${x#key=}
 			fi
 			export CRYPTTAB_KEY="$cryptkey"
 			;;
+		tries=*)
+			crypttries="${x#tries=}"
+			case "$crypttries" in
+			  *[![:digit:].]*)
+				crypttries=3
+				;;
+			esac
+			;;
 		rootdev)
 			cryptrootdev="yes"
 			;;
@@ -262,16 +273,21 @@ setup_mapping()
 				cryptkeyscript="plymouth ask-for-password --prompt"
 				cryptkey=$(printf "$cryptkey")
 			else
-				dmesg -n 1
 				cryptkeyscript="/lib/cryptsetup/naskpass"
 			fi
 		fi
 
 
 		if [ ! -e "$NEWROOT" ]; then
-			if ! crypttarget="$crypttarget" cryptsource="$cryptsource" \
-			     $cryptkeyscript "$cryptcreate" ; then
-				continue;
+			if [ -x /bin/plymouth ] && plymouth --ping; then
+				message "naskpass does not work with playmouth, falling back to default askpass .."
+				if ! crypttarget="$crypttarget" cryptsource="$cryptsource" \
+				     $cryptkeyscript "$cryptkey" | $cryptcreate --key-file=- ; then
+					message "cryptsetup: cryptsetup failed, bad password or options?"
+					continue
+				fi
+			else
+				$cryptkeyscript -c "$cryptcreate"
 			fi
 		fi
 
-- 
cgit v1.2.3