mirror of
https://github.com/systemd/systemd.git
synced 2025-08-25 13:49:55 +03:00
cryptenroll,homectl,journalctl: adjust messages before qrcodes
Users will generally know what a qrcode is, so let's not treat them as dumb and
explain that it can be scanned. OTOH, we should say what the qrcode contains
and it is useful to give a hint why the users would want to scan it. Reword
messages accordingly.
(Also, don't say "to your phone", when somebody might be using a stolen phone,
or something else then a phone.)
(cherry picked from commit 10faa40ba7
)
This commit is contained in:
committed by
Luca Boccassi
parent
0ec7854d44
commit
fefd60bf7a
@ -67,7 +67,7 @@ int enroll_recovery(
|
||||
"whenever authentication is requested.\n", stderr);
|
||||
fflush(stderr);
|
||||
|
||||
(void) print_qrcode(stderr, "You may optionally scan the recovery key off screen", password);
|
||||
(void) print_qrcode(stderr, "Optionally scan the recovery key for safekeeping", password);
|
||||
|
||||
if (asprintf(&keyslot_as_string, "%i", keyslot) < 0) {
|
||||
r = log_oom();
|
||||
|
@ -159,7 +159,7 @@ int identity_add_recovery_key(JsonVariant **v) {
|
||||
"whenever authentication is requested.\n", stderr);
|
||||
fflush(stderr);
|
||||
|
||||
(void) print_qrcode(stderr, "You may optionally scan the recovery key off screen", password);
|
||||
(void) print_qrcode(stderr, "Optionally scan the recovery key for safekeeping", password);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -198,9 +198,7 @@ int action_setup_keys(void) {
|
||||
if (!url)
|
||||
return log_oom();
|
||||
|
||||
(void) print_qrcode(stderr,
|
||||
"To transfer the verification key to your phone scan the QR code below",
|
||||
url);
|
||||
(void) print_qrcode(stderr, "Scan the verification key to transfer it to another device", url);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user