From: Tails developers <amnesia@boum.org>
Date: Wed, 9 Nov 2011 12:13:09 +0000 (+0100)
Subject: Fixing an incorrectly redirected newline.
X-Git-Tag: debian/3.0_a23-1~17
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=544c8db939aa26e57a2765fc0da55554ad8b3ec6;hp=959403d20e2259c10de7ef55b9226c40812eabd7;p=live-boot-grml.git

Fixing an incorrectly redirected newline.

Since this newline was written to stdout it both messed up the the
display of errors while entering a LUKS passphrase, and caused
find_cow_device to return a bad string under certain
circumstances. Example: You have home-rw on /dev/sdX1. You'll first
be asked for passphrase for "live-rw on /dev/sdX1", which you skip (a
newline has been written to stdout now). Then you're asked for
"home-rw on /dev/sdX1", which is what you want so you enter it.
Thanks to the spurious newline find_cow_device returns "\n/dev/loopY",
which breaks some tests later.
---

diff --git a/scripts/live-helpers b/scripts/live-helpers
index f67e421..f88108a 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -357,7 +357,7 @@ find_cow_device ()
 						break
 					fi
 
-					echo
+					echo >&6
 					echo -n "There was an error decrypting ${devname} ... Retry? [Y/n] " >&6
 					read answer