Skip to content
Permalink
master
Switch branches/tags
Go to file
 
 
Cannot retrieve contributors at this time
--- /usr/share/initramfs-tools/scripts/local-top/cryptroot 2012-11-07 16:28:47.000000000 +0100
+++ /usr/share/initramfs-tools/scripts/local-top/cryptroot 2015-03-11 23:25:18.000000000 +0100
@@ -16,11 +16,15 @@ prereqs()
done
}
+NOPLYMOUTH=0
+
case $1 in
prereqs)
prereqs
exit 0
;;
+remote)
+ NOPLYMOUTH=1
esac
# source for log_*_msg() functions, see LP: #272301
@@ -31,7 +35,7 @@ esac
#
message()
{
- if [ -x /bin/plymouth ] && plymouth --ping; then
+ if [ "${NOPLYMOUTH:-0}" -eq 0 -a -x /bin/plymouth ] && plymouth --ping; then
plymouth message --text="$@"
else
echo "$@" >&2
@@ -269,7 +273,7 @@ setup_mapping()
if [ -z "$cryptkeyscript" ]; then
cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter passphrase: "
- if [ -x /bin/plymouth ] && plymouth --ping; then
+ if [ "${NOPLYMOUTH:-0}" -eq 0 -a -x /bin/plymouth ] && plymouth --ping; then
cryptkeyscript="plymouth ask-for-password --prompt"
cryptkey=$(printf "$cryptkey")
else