shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

cryptenroll,homectl,journalctl: adjust messages before qrcodes

Browse Source 
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 10faa40ba781cf499258a3b37de02dd643822dc6)
(cherry picked from commit fefd60bf7ad9f361c85395ab38f10482f3007f15)
(cherry picked from commit 4ca8f5e68dc86606890806d7c17ae71d17e1cd9a)
(cherry picked from commit d415c1d8a321d13012081a7f31533db064311b1a)
(cherry picked from commit 617136c95cdd6af5b74c618ed1aca6d16ca7b428)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-10-28 13:59:05 +01:00 committed by Luca Boccassi
parent f00b2b689f
commit fc903a3023
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptenroll/cryptenroll-recovery.c
View File

@ -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();

2
src/home/homectl-recovery-key.c
View File

@ -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;
}