summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-11-09 13:13:09 +0100
committerDaniel Baumann <daniel@debian.org>2011-11-24 09:42:08 +0100
commit544c8db939aa26e57a2765fc0da55554ad8b3ec6 (patch)
tree0a9586b95d31dae1889b484d2e536ef8f76cae8e /scripts
parent959403d20e2259c10de7ef55b9226c40812eabd7 (diff)
downloadlive-boot-544c8db939aa26e57a2765fc0da55554ad8b3ec6.tar.gz
live-boot-544c8db939aa26e57a2765fc0da55554ad8b3ec6.zip
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/live-helpers2
1 files changed, 1 insertions, 1 deletions
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