From 544c8db939aa26e57a2765fc0da55554ad8b3ec6 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Wed, 9 Nov 2011 13:13:09 +0100 Subject: [PATCH] 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. --- scripts/live-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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