eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-18 14:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clarify confirmation prompt text.

Browse Source 
Fixes: #473
This commit is contained in:
Ondrej Kozina
2019-11-22 15:28:03 +01:00
parent 6b1be52e6b
commit 684f43d84d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils_tools.c
View File

@@ -142,7 +142,7 @@ static int _dialog(const char *msg, void *usrptr, int default_answer)
if (isatty(STDIN_FILENO) && !opt_batch_mode) { if (isatty(STDIN_FILENO) && !opt_batch_mode) {
log_std("\nWARNING!\n========\n"); log_std("\nWARNING!\n========\n");
log_std("%s\n\nAre you sure? (Type uppercase yes): ", msg); log_std("%s\n\nAre you sure? (Type 'yes' in capital letters): ", msg);
fflush(stdout); fflush(stdout);
if(getline(&answer, &size, stdin) == -1) { if(getline(&answer, &size, stdin) == -1) {
r = 0; r = 0;

8
tests/compat-test
View File

@@ -843,7 +843,7 @@ expect - >/dev/null <<EOF
proc abort {} { send_error "Timeout. "; exit 2 } proc abort {} { send_error "Timeout. "; exit 2 }
set timeout 10 set timeout 10
eval spawn $CRYPTSETUP luksKillSlot -v $LOOPDEV 0 eval spawn $CRYPTSETUP luksKillSlot -v $LOOPDEV 0
expect timeout abort "Are you sure? (Type uppercase yes):" expect timeout abort "Are you sure? (Type 'yes' in capital letters):"
send "YES\n" send "YES\n"
expect timeout abort "Enter any remaining passphrase:" expect timeout abort "Enter any remaining passphrase:"
sleep 0.1 sleep 0.1
@@ -862,7 +862,7 @@ expect - >/dev/null <<EOF
proc abort {} { send_error "Timeout. "; exit 2 } proc abort {} { send_error "Timeout. "; exit 2 }
set timeout 10 set timeout 10
eval spawn $CRYPTSETUP luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV eval spawn $CRYPTSETUP luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV
expect timeout abort "Are you sure? (Type uppercase yes):" expect timeout abort "Are you sure? (Type 'yes' in capital letters):"
send "YES\n" send "YES\n"
expect timeout abort "Enter passphrase for $EXPECT_DEV:" expect timeout abort "Enter passphrase for $EXPECT_DEV:"
sleep 0.1 sleep 0.1
@@ -887,12 +887,12 @@ expect - >/dev/null <<EOF
proc abort {} { send_error "Timeout. "; exit 2 } proc abort {} { send_error "Timeout. "; exit 2 }
set timeout 10 set timeout 10
eval spawn $CRYPTSETUP erase -v $LOOPDEV eval spawn $CRYPTSETUP erase -v $LOOPDEV
expect timeout abort "Are you sure? (Type uppercase yes):" expect timeout abort "Are you sure? (Type 'yes' in capital letters):"
send "YES\n" send "YES\n"
expect timeout abort "Command successful." expect timeout abort "Command successful."
expect timeout abort eof expect timeout abort eof
eval spawn $CRYPTSETUP luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV eval spawn $CRYPTSETUP luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV
expect timeout abort "Are you sure? (Type uppercase yes):" expect timeout abort "Are you sure? (Type 'yes' in capital letters):"
send "YES\n" send "YES\n"
expect timeout abort "Enter passphrase for $EXPECT_DEV:" expect timeout abort "Enter passphrase for $EXPECT_DEV:"
sleep 0.1 sleep 0.1