1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +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.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-10-28 13:59:05 +01:00
parent abf1cae0a7
commit 10faa40ba7
3 changed files with 3 additions and 5 deletions

View File

@ -67,7 +67,7 @@ int enroll_recovery(
"whenever authentication is requested.\n", stderr); "whenever authentication is requested.\n", stderr);
fflush(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) { if (asprintf(&keyslot_as_string, "%i", keyslot) < 0) {
r = log_oom(); r = log_oom();

View File

@ -160,7 +160,7 @@ int identity_add_recovery_key(sd_json_variant **v) {
"whenever authentication is requested.\n", stderr); "whenever authentication is requested.\n", stderr);
fflush(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; return 0;
} }

View File

@ -199,9 +199,7 @@ int action_setup_keys(void) {
if (!url) if (!url)
return log_oom(); return log_oom();
(void) print_qrcode(stderr, (void) print_qrcode(stderr, "Scan the verification key to transfer it to another device", url);
"To transfer the verification key to your phone scan the QR code below",
url);
#endif #endif
return 0; return 0;