Fixing an incorrectly redirected newline.
authorTails developers <amnesia@boum.org>
Wed, 9 Nov 2011 12:13:09 +0000 (13:13 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 24 Nov 2011 08:42:08 +0000 (09:42 +0100)
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

index f67e421..f88108a 100644 (file)
@@ -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