From: Lennart Poettering Date: Fri, 30 Jun 2023 08:22:35 +0000 (+0200) Subject: man: make sure credentials properly show up in directives index X-Git-Tag: v254-rc1~33^2~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8914f7e8e41c0fcd05d3d8d4fe39ce0e6addac69;p=thirdparty%2Fsystemd.git man: make sure credentials properly show up in directives index --- diff --git a/man/directives-template.xml b/man/directives-template.xml index 114707d2d00..0b6ee219293 100644 --- a/man/directives-template.xml +++ b/man/directives-template.xml @@ -49,6 +49,15 @@ + + System Credentials + + System credentials understood by the system and service manager and various other + components: + + + + EFI variables diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml index becb5f52ace..192b91c2964 100644 --- a/man/systemd-firstboot.xml +++ b/man/systemd-firstboot.xml @@ -308,10 +308,10 @@ (see systemd.exec1 for details). The following credentials are used when passed in: - + - passwd.hashed-password.root - passwd.plaintext-password.root + passwd.hashed-password.root + passwd.plaintext-password.root A hashed or plaintext version of the root password to use, in place of prompting the user. These credentials are equivalent to the same ones defined for the @@ -320,7 +320,7 @@ - passwd.shell.root + passwd.shell.root Specifies the shell binary to use for the specified account. Equivalent to the credential of the same name defined for the @@ -329,20 +329,20 @@ - firstboot.locale - firstboot.locale-messages + firstboot.locale + firstboot.locale-messages These credentials specify the locale settings to set during first boot, in place of prompting the user. - firstboot.keymap + firstboot.keymap This credential specifies the keyboard setting to set during first boot, in place of prompting the user. - Note the relationship to the vconsole.keymap credential understood by + Note the relationship to the vconsole.keymap credential understood by systemd-vconsole-setup.service8: both ultimately affect the same setting, but firstboot.keymap is written into /etc/vconsole.conf on first boot (if not already configured), and then read from @@ -352,7 +352,7 @@ - firstboot.timezone + firstboot.timezone This credential specifies the system timezone setting to set during first boot, in place of prompting the user. diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 05d20bbf355..5a87f048323 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -407,7 +407,7 @@ search foobar.com barbar.com (see systemd.exec1 for details). The following credentials are used when passed in: - + network.dns network.search_domains diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml index 4174184c152..975ffadefa1 100644 --- a/man/systemd-sysctl.service.xml +++ b/man/systemd-sysctl.service.xml @@ -89,9 +89,9 @@ (see systemd.exec1 for details). The following credentials are used when passed in: - + - sysctl.extra + sysctl.extra The contents of this credential may contain additional lines to operate on. The credential contents should follow the same format as any other sysctl.d/ drop-in diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml index 34d3cab5c7e..49f634b1807 100644 --- a/man/systemd-sysusers.xml +++ b/man/systemd-sysusers.xml @@ -143,9 +143,9 @@ (see systemd.exec1 for details). The following credentials are used when passed in: - + - passwd.hashed-password.user + passwd.hashed-password.user A UNIX hashed password string to use for the specified user, when creating an entry for it. This is particularly useful for the root user as it allows provisioning the default root password to use via a unit file drop-in or from a container manager passing in this @@ -155,7 +155,7 @@ - passwd.plaintext-password.user + passwd.plaintext-password.user Similar to passwd.hashed-password.user but expect a literal, plaintext password, which is then automatically hashed before used for the user @@ -166,13 +166,13 @@ - passwd.shell.user + passwd.shell.user Specifies the shell binary to use for the specified account when creating it. - sysusers.extra + sysusers.extra The contents of this credential may contain additional lines to operate on. The credential contents should follow the same format as any other sysusers.d/ diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 3a9699ff4b1..decd66d5c66 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -250,9 +250,9 @@ (see systemd.exec1 for details). The following credentials are used when passed in: - + - tmpfiles.extra + tmpfiles.extra The contents of this credential may contain additional lines to operate on. The credential contents should follow the same format as any other tmpfiles.d/ diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml index f9f8327a68c..e462ef8f603 100644 --- a/man/systemd-vconsole-setup.service.xml +++ b/man/systemd-vconsole-setup.service.xml @@ -57,7 +57,7 @@ (see systemd.exec1 for details). The following credentials are used when passed in: - + vconsole.keymap vconsole.keymap_toggle diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml index f75a83cc3fb..97507cf2525 100644 --- a/man/systemd.system-credentials.xml +++ b/man/systemd.system-credentials.xml @@ -40,7 +40,7 @@ Well known system credentials - + firstboot.keymap @@ -52,7 +52,7 @@ firstboot.locale - firstboot.locale-message + firstboot.locale-messages The system locale to set (e.g. de_DE.UTF-8). Read by systemd-firstboot1, diff --git a/man/systemd.xml b/man/systemd.xml index 3ceac5f9194..d63e70f0c87 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1053,7 +1053,7 @@ The service manager when run as PID 1 reads the following system credentials: - + vmm.notify_socket diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 29fc61dd67e..076e06e8215 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -334,7 +334,7 @@ static int prompt_locale(int rfd) { r = read_credential("firstboot.locale-messages", (void**) &arg_locale_messages, NULL); if (r < 0) - log_debug_errno(r, "Failed to read credential firstboot.locale-message, ignoring: %m"); + log_debug_errno(r, "Failed to read credential firstboot.locale-messages, ignoring: %m"); else acquired_from_creds = true;