From fb6fa7903dd8cc92fd6e1bc62082edfad4a53be5 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Mon, 6 May 2013 18:06:10 +0200
Subject: [PATCH] Make plymouth ask-for-password work as expected

---
 defaults/initrd.scripts | 4 ++--
 defaults/linuxrc        | 1 +
 gen_initramfs.sh        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7405aa5..65a5376 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1044,7 +1044,7 @@ openLUKS() {
 			LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
 
 			setup_md_device ${LUKS_DEVICE}
-			cryptsetup isLuks ${LUKS_DEVICE}
+			/sbin/cryptsetup isLuks ${LUKS_DEVICE}
 			if [ $? -ne 0 ]
 			then
 				bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
@@ -1130,7 +1130,7 @@ openLUKS() {
 					fi
 				fi
 				# At this point, keyfile or not, we're ready!
-				crypt_exec "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
+				crypt_exec "${gpg_cmd}/sbin/cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
 				crypt_exec_ret=$?
 
 				[ -e /dev/tty.org ] \
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5cf73ff..0d8f65f 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -17,6 +17,7 @@ fi
 mount -t proc -o noexec,nosuid,nodev proc /proc >/dev/null 2>&1
 mount -o remount,rw / >/dev/null 2>&1
 mount -t tmpfs -o rw,nosuid,nodev,relatime,mode=755 none /run 2>&1
+mount -t tmpfs none /dev/shm 2>&1
 
 # Set up symlinks
 /bin/busybox --install -s
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 0002533..9848080 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -63,7 +63,7 @@ append_base_layout() {
 		rm -rf "${TEMP}/initramfs-base-temp" > /dev/null
 	fi
 
-	mkdir -p ${TEMP}/initramfs-base-temp/dev
+	mkdir -p ${TEMP}/initramfs-base-temp/dev/shm
 	mkdir -p ${TEMP}/initramfs-base-temp/bin
 	mkdir -p ${TEMP}/initramfs-base-temp/etc
 	mkdir -p ${TEMP}/initramfs-base-temp/usr