Blame ecryptfs-utils-68-headn1.patch
|
Michal Hlavinka |
aefcf6 |
diff -up ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1 ecryptfs-utils-68/src/utils/ecryptfs-setup-private
|
|
Michal Hlavinka |
aefcf6 |
--- ecryptfs-utils-68/src/utils/ecryptfs-setup-private.headn1 2008-12-22 23:23:24.000000000 +0100
|
|
Michal Hlavinka |
aefcf6 |
+++ ecryptfs-utils-68/src/utils/ecryptfs-setup-private 2009-01-12 17:36:20.386755719 +0100
|
|
Michal Hlavinka |
aefcf6 |
@@ -198,13 +198,13 @@ if [ -z "$LOGINPASS" ] && [ "$BOOTSTRAP"
|
|
Michal Hlavinka |
aefcf6 |
while [ $tries -lt $PW_ATTEMPTS ]; do
|
|
Michal Hlavinka |
aefcf6 |
stty -echo
|
|
Michal Hlavinka |
aefcf6 |
echo -n "$MESSAGE: "
|
|
Michal Hlavinka |
aefcf6 |
- LOGINPASS=`line`
|
|
Michal Hlavinka |
aefcf6 |
+ LOGINPASS=`head -n1`
|
|
Michal Hlavinka |
aefcf6 |
stty $stty_orig
|
|
Michal Hlavinka |
aefcf6 |
echo
|
|
Michal Hlavinka |
aefcf6 |
if [ $WRAPPING_PASS != "LOGIN" ]; then
|
|
Michal Hlavinka |
aefcf6 |
stty -echo
|
|
Michal Hlavinka |
aefcf6 |
echo -n "$MESSAGE (again): "
|
|
Michal Hlavinka |
aefcf6 |
- LOGINPASS2=`line`
|
|
Michal Hlavinka |
aefcf6 |
+ LOGINPASS2=`head -n1`
|
|
Michal Hlavinka |
aefcf6 |
stty $stty_orig
|
|
Michal Hlavinka |
aefcf6 |
echo
|
|
Michal Hlavinka |
aefcf6 |
if [ "$LOGINPASS" != "$LOGINPASS2" ]; then
|
|
Michal Hlavinka |
aefcf6 |
@@ -239,7 +239,7 @@ if [ -z "$MOUNTPASS" ]; then
|
|
Michal Hlavinka |
aefcf6 |
while [ $tries -lt $PW_ATTEMPTS ]; do
|
|
Michal Hlavinka |
aefcf6 |
stty -echo
|
|
Michal Hlavinka |
aefcf6 |
echo -n "Enter your mount passphrase [leave blank to generate one]: "
|
|
Michal Hlavinka |
aefcf6 |
- MOUNTPASS=`line`
|
|
Michal Hlavinka |
aefcf6 |
+ MOUNTPASS=`head -n1`
|
|
Michal Hlavinka |
aefcf6 |
stty $stty_orig
|
|
Michal Hlavinka |
aefcf6 |
echo
|
|
Michal Hlavinka |
aefcf6 |
if [ -z "$MOUNTPASS" ]; then
|
|
Michal Hlavinka |
aefcf6 |
@@ -249,7 +249,7 @@ if [ -z "$MOUNTPASS" ]; then
|
|
Michal Hlavinka |
aefcf6 |
else
|
|
Michal Hlavinka |
aefcf6 |
stty -echo
|
|
Michal Hlavinka |
aefcf6 |
echo -n "Enter your mount passphrase (again): "
|
|
Michal Hlavinka |
aefcf6 |
- MOUNTPASS2=`line`
|
|
Michal Hlavinka |
aefcf6 |
+ MOUNTPASS2=`head -n1`
|
|
Michal Hlavinka |
aefcf6 |
stty $stty_orig
|
|
Michal Hlavinka |
aefcf6 |
echo
|
|
Michal Hlavinka |
aefcf6 |
if [ "$MOUNTPASS" != "$MOUNTPASS2" ]; then
|