SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firstboot: use consistent wording for prompts

Browse Source
This commit is contained in:
Michael Ferrari
2024-10-30 20:13:53 +01:00
parent f4da5ed538
commit 26f9e08231
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/firstboot/firstboot.c
+10 -8
View File
@@ -323,7 +323,7 @@ static int prompt_locale(int rfd) {
print_welcome(rfd);
r = prompt_loop("Please enter system locale name or number",
r = prompt_loop("Please enter the new system locale name or number",
locales, 60, is_valid, &arg_locale);
if (r < 0)
return r;
@@ -331,7 +331,7 @@ static int prompt_locale(int rfd) {
if (isempty(arg_locale))
return 0;
r = prompt_loop("Please enter system message locale name or number",
r = prompt_loop("Please enter the new system message locale name or number",
locales, 60, is_valid, &arg_locale_messages);
if (r < 0)
return r;
@@ -446,7 +446,7 @@ static int prompt_keymap(int rfd) {
print_welcome(rfd);
return prompt_loop("Please enter system keymap name or number",
return prompt_loop("Please enter the new keymap name or number",
kmaps, 60, determine_keymap_validity_func(rfd), &arg_keymap);
}
@@ -536,7 +536,7 @@ static int prompt_timezone(int rfd) {
print_welcome(rfd);
r = prompt_loop("Please enter timezone name or number",
r = prompt_loop("Please enter the new timezone name or number",
zones, 30, timezone_is_valid_log_debug, &arg_timezone);
if (r < 0)
return r;
@@ -620,7 +620,8 @@ static int prompt_hostname(int rfd) {
for (;;) {
_cleanup_free_ char *h = NULL;
r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET));
r = ask_string(&h, "%s Please enter the new hostname (empty to skip): ",
special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET));
if (r < 0)
return log_error_errno(r, "Failed to query hostname: %m");
@@ -730,8 +731,8 @@ static int prompt_root_password(int rfd) {
print_welcome(rfd);
msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip):");
msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again:");
msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter the new root password (empty to skip):");
msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter the new root password again:");
suggest_passwords();
@@ -825,7 +826,8 @@ static int prompt_root_shell(int rfd) {
for (;;) {
_cleanup_free_ char *s = NULL;
r = ask_string(&s, "%s Please enter root shell for new system (empty to skip): ", special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET));
r = ask_string(&s, "%s Please enter the new root shell (empty to skip): ",
special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET));
if (r < 0)
return log_error_errno(r, "Failed to query root shell: %m");