Complete Plymouth integration. Fix the last set of minor bugs

defaults/initrd.scripts

@@ -6,6 +6,8 @@ splash() {
 	return 0
 }
 
+[ -e "${INITRD_SPLASH}" ] && . "${INITRD_SPLASH}"
+
 is_fbsplash() {
 	if [ -e "${INITRD_SPLASH}" ] && [ "${FBSPLASH}" = '1' ]
 	then
@@ -29,8 +31,6 @@ is_plymouth_started() {
 	return 1
 }
 
-is_fbsplash && . "${INITRD_SPLASH}"
-
 splashcmd() {
 	# plymouth support
 	local cmd="${1}"
@@ -574,7 +574,7 @@ ask_for_password() {
 		if is_plymouth_started
 		then
 			"${PLYMOUTH_BIN}" ask-for-password \
-				--prompt "$ply_prompt" \
+				--prompt="$ply_prompt" \
 				--number-of-tries=$ply_tries \
 				--command="$ply_cmd"
 			ret=$?
@@ -615,10 +615,10 @@ crypt_exec() {
 	then
 		eval ${1} >/dev/null 2>/dev/null
 	else
-		ask_for_password --ply-tries 1 \
+		ask_for_password --ply-tries 5 \
 			--ply-cmd "${1}" \
-			--ply-prompt "Password (${LUKS_DEVICE})" \
-			--tty-tries 1 \
+			--ply-prompt "Encryption password (${LUKS_DEVICE}): " \
+			--tty-tries 5 \
 			--tty-cmd "${1}" || return 1
 		return 0
 	fi

gen_initramfs.sh

@@ -434,8 +434,8 @@ append_plymouth() {
 		gen_die "cannot setup the default plymouth theme"
 
 	local libs=(
-		"/lib*/libply-splash-core.so*"
-		"/usr/lib*/libply-splash-graphics.so*"
+		"/lib*/libply-splash-core.so.*"
+		"/usr/lib*/libply-splash-graphics.so.*"
 		"/usr/lib*/plymouth/text.so"
 		"/usr/lib*/plymouth/details.so"
 		"/usr/lib*/plymouth/renderers/frame-buffer.so"