From 617136c95cdd6af5b74c618ed1aca6d16ca7b428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 28 Oct 2024 13:59:05 +0100 Subject: [PATCH] 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 10faa40ba781cf499258a3b37de02dd643822dc6) (cherry picked from commit fefd60bf7ad9f361c85395ab38f10482f3007f15) (cherry picked from commit 4ca8f5e68dc86606890806d7c17ae71d17e1cd9a) (cherry picked from commit d415c1d8a321d13012081a7f31533db064311b1a) --- src/cryptenroll/cryptenroll-recovery.c | 2 +- src/home/homectl-recovery-key.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cryptenroll/cryptenroll-recovery.c b/src/cryptenroll/cryptenroll-recovery.c index 7c170f2850..f12c271338 100644 --- a/src/cryptenroll/cryptenroll-recovery.c +++ b/src/cryptenroll/cryptenroll-recovery.c @@ -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(); diff --git a/src/home/homectl-recovery-key.c b/src/home/homectl-recovery-key.c index ff1ab6820d..b88e9a150c 100644 --- a/src/home/homectl-recovery-key.c +++ b/src/home/homectl-recovery-key.c @@ -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; }