[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-25-gf885467

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 544c8db939aa26e57a2765fc0da55554ad8b3ec6
Author: Tails developers <amnesia at boum.org>
Date:   Wed Nov 9 13:13:09 2011 +0100

    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
 

-- 
live-boot