From debf2ddd2880e020070a9108925c4e42a7295d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Apr 2020 10:28:50 +0200 Subject: [PATCH 1/7] man: reorder hostname1(5) --- man/org.freedesktop.hostname1.xml | 49 ++++++++++++++++++------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml index c852bed6de9..f707b9080de 100644 --- a/man/org.freedesktop.hostname1.xml +++ b/man/org.freedesktop.hostname1.xml @@ -219,10 +219,6 @@ node /org/freedesktop/hostname1 { it could not be auto-detected. Set this property to the empty string to reenable the automatic detection of the chassis type from firmware information. - A client that wants to change the local hostname for DHCP/mDNS should invoke - SetHostname("newname", false) as soon as the name is available and afterwards reset it via - SetHostname(""). - Note that systemd-hostnamed starts only on request and terminates after a short idle period. This effectively means that PropertyChanged messages are not sent out for changes made directly on the files (as in: administrator edits the files with vi). This is @@ -244,33 +240,46 @@ node /org/freedesktop/hostname1 { machine-info3 for that. For more information on these files and syscalls see the respective man pages. - The user_interaction boolean parameters can be used to control whether PolicyKit - should interactively ask the user for authentication credentials if required. + + Security - The PolicyKit action for SetHostname() is - org.freedesktop.hostname1.set-hostname. For - SetStaticHostname() and SetPrettyHostname() it is - org.freedesktop.hostname1.set-static-hostname. For - SetIconName() and SetChassis() it is - org.freedesktop.hostname1.set-machine-info. + The interactive boolean parameters can be used to control whether PolicyKit + should interactively ask the user for authentication credentials if required. - Here are three examples show how the pretty hostname and the icon name should be used: + The PolicyKit action for SetHostname() is + org.freedesktop.hostname1.set-hostname. For + SetStaticHostname() and SetPrettyHostname() it is + org.freedesktop.hostname1.set-static-hostname. For + SetIconName() and SetChassis() it is + org.freedesktop.hostname1.set-machine-info. + + + + + Recommendations + + Here are three examples that show how the pretty hostname and the icon name should be used: - When registering DNS-SD services: use the pretty hostname in the service name, and - pass the icon name in the TXT data, if there is an icon name. Browsing clients can then show the server - icon on each service. This is especially useful for WebDAV applications or UPnP media sharing. + When registering DNS-SD services: use the pretty hostname in the service name, and pass + the icon name in the TXT data, if there is an icon name. Browsing clients can then show the server icon + on each service. This is especially useful for WebDAV applications or UPnP media sharing. Set the bluetooth name to the pretty hostname. - When your file browser has a "Computer" icon, replace the name with the pretty hostname if set, and the icon with the icon name, if it is set. + When your file browser has a "Computer" icon, replace the name with the pretty hostname + if set, and the icon with the icon name, if it is set. To properly handle name lookups with changing local hostnames without having to edit - /etc/hosts, we recommend using systemd-hostnamed in - combination with nss-myhostname3. + /etc/hosts, we recommend using systemd-hostnamed in combination + with nss-myhostname3. + A client that wants to change the local hostname for DHCP/mDNS should invoke + SetHostname("newname", false) as soon as the name is available and afterwards reset it via + SetHostname(""). + Here are some recommendations to follow when generating a static (internet) hostname from a pretty name: @@ -314,7 +323,7 @@ node /org/freedesktop/hostname1 { Of course, an already valid internet hostname label you enter and pass through this - conversion should stay unmodified, so that users have direct control of it, if they want -- by simply + conversion should stay unmodified, so that users have direct control of it, if they want — by simply ignoring the fact that the pretty hostname is pretty and just edit it as if it was the normal internet name. From 38b38500c6011d6bc59171ee23d92fba46bd131e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Apr 2020 10:37:40 +0200 Subject: [PATCH 2/7] tree-wide: use "hostname" spelling everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not that I think that "hostname" is vastly superior to "host name". Quite the opposite — the difference is small, and in some context the two-word version does fit better. But in the tree, there are ~200 occurrences of the first, and >1600 of the other, and consistent spelling is more important than any particular spelling choice. --- NEWS | 18 +++++++++--------- TODO | 2 +- docs/CODING_STYLE.md | 2 +- man/hostnamectl.xml | 4 ++-- man/machine-info.xml | 2 +- man/machinectl.xml | 6 +++--- man/nss-resolve.xml | 2 +- man/org.freedesktop.resolve1.xml | 2 +- man/resolvectl.xml | 2 +- man/resolved.conf.xml | 2 +- man/systemd-firstboot.xml | 4 ++-- man/systemd-nspawn.xml | 4 ++-- man/systemd-resolved.service.xml | 6 +++--- man/systemd.network.xml | 12 ++++++------ meson_options.txt | 2 +- po/be.po | 10 +++++----- po/be@latin.po | 10 +++++----- po/bg.po | 10 +++++----- po/ca.po | 10 +++++----- po/cs.po | 10 +++++----- po/da.po | 10 +++++----- po/de.po | 10 +++++----- po/el.po | 10 +++++----- po/es.po | 10 +++++----- po/fr.po | 10 +++++----- po/gl.po | 10 +++++----- po/hr.po | 10 +++++----- po/hu.po | 10 +++++----- po/id.po | 10 +++++----- po/it.po | 10 +++++----- po/ja.po | 10 +++++----- po/ko.po | 10 +++++----- po/lt.po | 10 +++++----- po/pl.po | 10 +++++----- po/pt_BR.po | 10 +++++----- po/ro.po | 10 +++++----- po/ru.po | 10 +++++----- po/sk.po | 10 +++++----- po/sr.po | 10 +++++----- po/sv.po | 10 +++++----- po/tr.po | 10 +++++----- po/uk.po | 10 +++++----- po/zh_CN.po | 10 +++++----- po/zh_TW.po | 10 +++++----- src/basic/hostname-util.c | 4 ++-- src/core/unit-printf.c | 2 +- src/firstboot/firstboot.c | 2 +- src/hostname/hostnamed.c | 16 ++++++++-------- src/hostname/org.freedesktop.hostname1.policy | 8 ++++---- src/journal/journald-server.c | 2 +- src/libsystemd-network/sd-dhcp-lease.c | 2 +- src/nss-myhostname/nss-myhostname.c | 2 +- src/resolve/resolved-bus.c | 2 +- src/resolve/resolved-etc-hosts.c | 4 ++-- src/resolve/resolved-manager.c | 6 +++--- src/shared/install-printf.c | 2 +- 56 files changed, 206 insertions(+), 206 deletions(-) diff --git a/NEWS b/NEWS index 4574c4555a3..cac6c1b294a 100644 --- a/NEWS +++ b/NEWS @@ -2032,7 +2032,7 @@ CHANGES WITH 239: lookup is likely to trigger nss-ldap which in turn might use NSS to ask systemd-resolved for hostname lookups. This will hence result in a deadlock: a user name lookup in order to start - systemd-resolved.service will result in a host name lookup for which + systemd-resolved.service will result in a hostname lookup for which systemd-resolved.service needs to be started already. There are multiple ways to work around this problem: pre-allocate the "systemd-resolve" user on such systems, so that nss-ldap won't be @@ -3001,7 +3001,7 @@ CHANGES WITH 235: A/AAAA resource record for the "_gateway" hostname, pointing to the current default IP gateway. Previously it did that for the "gateway" name, hampering adoption, as some distributions wanted to leave that - host name open for local use. The old behaviour may still be + hostname open for local use. The old behaviour may still be requested at build time. * systemd-networkd's [Address] section in .network files gained a new @@ -4342,7 +4342,7 @@ CHANGES WITH 230: again don't consider turning this on in your stable, LTS or production release just yet. (Note that you have to enable nss-resolve in /etc/nsswitch.conf, to actually use systemd-resolved - and its DNSSEC mode for host name resolution from local + and its DNSSEC mode for hostname resolution from local applications.) * systemd-resolve conveniently resolves DANE records with the --tlsa @@ -6160,14 +6160,14 @@ CHANGES WITH 218: for a unit, as declared in the (usually vendor-supplied) system preset files. - * nss-myhostname will now resolve the single-label host name + * nss-myhostname will now resolve the single-label hostname "gateway" to the locally configured default IP routing gateways, ordered by their metrics. This assigns a stable name to the used gateways, regardless which ones are currently configured. Note that the name will only be resolved after all other name sources (if nss-myhostname is configured properly) and should hence not negatively impact - systems that use the single-label host name "gateway" in + systems that use the single-label hostname "gateway" in other contexts. * systemd-inhibit now allows filtering by mode when listing @@ -7595,7 +7595,7 @@ CHANGES WITH 210: reported by uname()'s "machine" field. * systemd-networkd now supports matching on the system - virtualization, architecture, kernel command line, host name + virtualization, architecture, kernel command line, hostname and machine ID. * logind is now a lot more aggressive when suspending the @@ -7913,12 +7913,12 @@ CHANGES WITH 209: example, a line that creates /run/nologin). * A new API "sd-resolve.h" has been added which provides a simple - asynchronous wrapper around glibc NSS host name resolution + asynchronous wrapper around glibc NSS hostname resolution calls, such as getaddrinfo(). In contrast to glibc's getaddrinfo_a(), it does not use signals. In contrast to most other asynchronous name resolution libraries, this one does not reimplement DNS, but reuses NSS, so that alternate - host name resolution systems continue to work, such as mDNS, + hostname resolution systems continue to work, such as mDNS, LDAP, etc. This API is based on libasyncns, but it has been cleaned up for inclusion in systemd. @@ -9702,7 +9702,7 @@ CHANGES WITH 190: when he over-mounts a non-empty directory. * There are new specifiers that are resolved in unit files, - for the host name (%H), the machine ID (%m) and the boot ID + for the hostname (%H), the machine ID (%m) and the boot ID (%b). Contributions from: Allin Cottrell, Auke Kok, Brandon Philips, diff --git a/TODO b/TODO index b2fb1262af2..df2f91fe599 100644 --- a/TODO +++ b/TODO @@ -1165,7 +1165,7 @@ Features: a carrier is lost on a link. It should be removed instantly. - expose in the API the following bits: - option 15, domain name and/or option 119, search list - - option 12, host name and/or option 81, fqdn + - option 12, hostname and/or option 81, fqdn - option 123, 144, geolocation - option 252, configure http proxy (PAC/wpad) - provide a way to define a per-network interface default metric value diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index c8ca8bfefca..12a0c993fc9 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -424,7 +424,7 @@ layout: default ## Deadlocks -- Do not issue NSS requests (that includes user name and host name lookups) +- Do not issue NSS requests (that includes user name and hostname lookups) from PID 1 as this might trigger deadlocks when those lookups involve synchronously talking to services that we would need to start up. diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml index 03293382e6e..7ca62f48105 100644 --- a/man/hostnamectl.xml +++ b/man/hostnamectl.xml @@ -57,7 +57,7 @@ Use systemd-firstboot1 - to initialize the system host name for mounted (but not booted) + to initialize the system hostname for mounted (but not booted) system images. @@ -84,7 +84,7 @@ simplified in regards to the character set used before the latter are updated. This is done by removing special characters and spaces. This ensures that the pretty and the static hostname are always closely related while still following the validity rules of the specific name. This simplification of the hostname string is not done - if only the transient and/or static host names are set, and the pretty host name is left untouched. + if only the transient and/or static hostnames are set, and the pretty hostname is left untouched. Pass the empty string as the hostname to reset the selected hostnames to their default diff --git a/man/machine-info.xml b/man/machine-info.xml index 4fb27abe0a3..7a0a396a1eb 100644 --- a/man/machine-info.xml +++ b/man/machine-info.xml @@ -70,7 +70,7 @@ Lennart's Computer an Internet hostname of lennarts-computer might be a good choice. If this parameter is not set, an application should fall back - to the Internet host name for presentation + to the Internet hostname for presentation purposes. diff --git a/man/machinectl.xml b/man/machinectl.xml index c211ca02a94..e903eca7214 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -56,7 +56,7 @@ Machines are identified by names that follow the same rules - as UNIX and DNS host names. For details, see below. + as UNIX and DNS hostnames. For details, see below. Machines are instantiated from disk or file system images that frequently — but not necessarily — carry the same name as machines running @@ -383,7 +383,7 @@ image is optimized for file systems that support copy-on-write, and might not be efficient on others, due to file system limitations. - Note that this command leaves host name, machine ID and + Note that this command leaves hostname, machine ID and all other settings that could identify the instance unmodified. The original image and the cloned copy will hence share these credentials, and it might be necessary to manually @@ -851,7 +851,7 @@ The machinectl tool operates on machines and images whose names must be chosen following strict - rules. Machine names must be suitable for use as host names + rules. Machine names must be suitable for use as hostnames following a conservative subset of DNS and UNIX/Linux semantics. Specifically, they must consist of one or more non-empty label strings, separated by dots. No leading or trailing diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index cc33b2c0822..8bc75b13160 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -29,7 +29,7 @@ Description nss-resolve is a plug-in module for the GNU Name Service Switch (NSS) functionality of the - GNU C Library (glibc) enabling it to resolve host names via the + GNU C Library (glibc) enabling it to resolve hostnames via the systemd-resolved8 local network name resolution service. It replaces the nss-dns plug-in module that traditionally resolves hostnames via DNS. diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index ad7b6e20fb6..912f73677cf 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -394,7 +394,7 @@ node /org/freedesktop/resolve1 { default LLMNR setting is used. If yes, LLMNR is used for resolution of single-label names and the local hostname is registered on all local LANs for LLMNR resolution by peers. If no, LLMNR is turned off fully on this interface. If resolve, LLMNR - is only enabled for resolving names, but the local host name is not registered for other peers to + is only enabled for resolving names, but the local hostname is not registered for other peers to use. Similarly, the SetLinkMulticastDNS() method enables or disables MulticastDNS diff --git a/man/resolvectl.xml b/man/resolvectl.xml index cc049945941..e2d00b9cf08 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -45,7 +45,7 @@ interface the data was discovered. It also contains information on whether the information could be authenticated. All data for which local DNSSEC validation succeeds is considered authenticated. Moreover all data originating from local, trusted sources is also reported authenticated, including resolution of the local host - name, the localhost host name or all data from /etc/hosts. + name, the localhost hostname or all data from /etc/hosts. diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 81d156b8e3b..9be41baaa5a 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -68,7 +68,7 @@ Domains= A space-separated list of domains. These domains are used as search suffixes when resolving - single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified + single-label hostnames (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs). Search domains are strictly processed in the order they are specified, until the name with the suffix appended is found. For compatibility reasons, if this setting is not specified, the search domains listed in /etc/resolv.conf are used instead, if that file exists and any domains diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml index 560649f22c4..0eb212341f6 100644 --- a/man/systemd-firstboot.xml +++ b/man/systemd-firstboot.xml @@ -54,7 +54,7 @@ The system time zone - The system host name + The system hostname The machine ID of the system @@ -133,7 +133,7 @@ Sets the system hostname. The argument should - be a host name, compatible with DNS. This controls the + be a hostname, compatible with DNS. This controls the hostname5 configuration file. diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index b269b991703..577ae097c91 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -238,7 +238,7 @@ all subdirectories and subvolumes below it, but excluding any sub-mounts. May not be specified together with or . - Note that this switch leaves host name, machine ID and + Note that this switch leaves hostname, machine ID and all other settings that could identify the instance unmodified. @@ -250,7 +250,7 @@ If specified, the container is run with a temporary snapshot of its file system that is removed immediately when the container terminates. May not be specified together with . - Note that this switch leaves host name, machine ID and all other settings that could identify + Note that this switch leaves hostname, machine ID and all other settings that could identify the instance unmodified. Please note that — as with — taking the temporary snapshot is more efficient on file systems that support subvolume snapshots or 'reflinks' natively (btrfs or new xfs) than on more traditional file diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index a30c5f72b81..2aa5fec2186 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -53,7 +53,7 @@ (nss5). Usage of the glibc NSS module nss-resolve8 is - required in order to allow glibc's NSS resolver functions to resolve host names via + required in order to allow glibc's NSS resolver functions to resolve hostnames via systemd-resolved. Additionally, systemd-resolved provides a local DNS stub listener on @@ -120,8 +120,8 @@ Single-label names are routed to all local interfaces capable of IP multicasting, using the LLMNR protocol. Lookups for IPv4 addresses are only sent via LLMNR on IPv4, and lookups for IPv6 - addresses are only sent via LLMNR on IPv6. Lookups for the locally configured host name and the - _gateway host name are never routed to LLMNR. + addresses are only sent via LLMNR on IPv6. Lookups for the locally configured hostname and the + _gateway hostname are never routed to LLMNR. Multi-label names with the domain suffix .local are routed to all local interfaces capable of IP multicasting, using the MulticastDNS protocol. As with LLMNR IPv4 diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 75a581816d3..98de000ac32 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -441,7 +441,7 @@ nearest-bridge, non-tpmr-bridge and customer-bridge. Defaults to false, which turns off LLDP packet emission. If not false, a short LLDP packet with information about the local system is sent out in regular intervals on the - link. The LLDP packet will contain information about the local host name, the local machine ID (as stored + link. The LLDP packet will contain information about the local hostname, the local machine ID (as stored in machine-id5) and the local interface name, as well as the pretty hostname of the system (as set in machine-info5). LLDP @@ -521,12 +521,12 @@ this link. Each item in the list should be a domain name, optionally prefixed with a tilde (~). The domains with the prefix are called "routing-only domains". The domains without the prefix are called "search domains" and are first used as search suffixes for - extending single-label host names (host names containing no dots) to become fully qualified - domain names (FQDNs). If a single-label host name is resolved on this interface, each of the + extending single-label hostnames (hostnames containing no dots) to become fully qualified + domain names (FQDNs). If a single-label hostname is resolved on this interface, each of the specified search domains are appended to it in turn, converting it into a fully qualified domain name, until one of them may be successfully resolved. - Both "search" and "routing-only" domains are used for routing of DNS queries: look-ups for host names + Both "search" and "routing-only" domains are used for routing of DNS queries: look-ups for hostnames ending in those domains (hence also single label names, if any "search domains" are listed), are routed to the DNS servers configured for this interface. The domain routing logic is particularly useful on multi-homed hosts with DNS servers serving particular private DNS zones on each interface. @@ -1470,7 +1470,7 @@ false. It is recommended to enable this option only on trusted networks, as setting this affects resolution - of all host names, in particular of single-label names. It is generally safer to use the supplied domain + of all hostnames, in particular of single-label names. It is generally safer to use the supplied domain only as routing domain, rather than as search domain, in order to not have it affect local resolution of single-label names. @@ -1779,7 +1779,7 @@ ~. Defaults to false. It is recommended to enable this option only on trusted networks, as setting this affects resolution - of all host names, in particular of single-label names. It is generally safer to use the supplied domain + of all hostnames, in particular of single-label names. It is generally safer to use the supplied domain only as routing domain, rather than as search domain, in order to not have it affect local resolution of single-label names. diff --git a/meson_options.txt b/meson_options.txt index 3526645a590..104a7ea0430 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -289,7 +289,7 @@ option('libcryptsetup', type : 'combo', choices : ['auto', 'true', 'false'], option('libcurl', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libcurl support') option('idn', type : 'boolean', - description : 'use IDN when printing host names') + description : 'use IDN when printing hostnames') option('libidn2', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libidn2 support') option('libidn', type : 'combo', choices : ['auto', 'true', 'false'], diff --git a/po/be.po b/po/be.po index 55d3c822870..65e5064fe06 100644 --- a/po/be.po +++ b/po/be.po @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Неабходна аўтэнтыфікацыя для перачытання стану systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Усталяваць імя вузла" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Неабходна аўтэнтыфікацыя для ўсталявання імя вузла." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Усталяваць статычнае імя вузла" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Неабходна аўтэнтыфікацыя для ўсталявання як статычнага так і прыгожага імя " "вузла." diff --git a/po/be@latin.po b/po/be@latin.po index bbd9223b748..1ce3efa8f53 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Nieabchodna aŭtentyfikacyja dlia pieračytannia stanu systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ustaliavać imia vuzla" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia imia vuzla." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ustaliavać statyčnaje imia vuzla" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia jak statyčnaha tak i " "pryhožaha imia vuzla." diff --git a/po/bg.po b/po/bg.po index 38b95278248..0e1f50736d6 100644 --- a/po/bg.po +++ b/po/bg.po @@ -69,21 +69,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "За презареждане на състоянието на systemd е необходима идентификация." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Задаване на име на машината" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "За задаване на име на локалната машина е необходима идентификация." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Задаване на статично име на машината" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "За задаване на статично име на локалната машина е необходима идентификация." diff --git a/po/ca.po b/po/ca.po index dd8cc56e343..68123ca5da6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -73,21 +73,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Es requereix autenticació per tornar a carregar l'estat de systemd." #: src/hostname/org.freedesktop.hostname1.policy:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Estableix el nom d'amfitrió" #: src/hostname/org.freedesktop.hostname1.policy:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Es requereix autenticació per establir el nom d'amfitrió local." #: src/hostname/org.freedesktop.hostname1.policy:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Estableix el nom d'amfitrió estàtic" #: src/hostname/org.freedesktop.hostname1.policy:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Es requereix autenticació per establir el nom d'amfitrió local configurat " "estàticament, així com el nom bonic d'amfitrió." diff --git a/po/cs.po b/po/cs.po index 819800132a4..78180f63895 100644 --- a/po/cs.po +++ b/po/cs.po @@ -120,21 +120,21 @@ msgid "" msgstr "Pro změnu hesla domovského adresáře uživatele je vyžadováno ověření." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Nastavit název stroje" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Pro nastavení lokálního názvu stroje je vyžadováno ověření." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nastavit statický název stroje" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Pro nastavení staticky konfigurovaného názvu lokálního stroje, stejně tak " "pro změnu uživatelsky přívětivého jména je vyžadováno ověření." diff --git a/po/da.po b/po/da.po index 7dee6128676..276c9e10ce6 100644 --- a/po/da.po +++ b/po/da.po @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentificering er nødvendig for at genindlæse systemd tilstanden." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Sæt værtsnavn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentificering er nødvendig for at sætte værtsnavn." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Sæt statisk værstnavn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentificering er nødvendig for at sætte det statisk konfigurerede lokale " "værtsnavn, lige så vel som det pæne værtsnavn." diff --git a/po/de.po b/po/de.po index cca79207d41..c5c753bb093 100644 --- a/po/de.po +++ b/po/de.po @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Rechnername festlegen" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Legitimierung ist zum Festlegen des lokalen Rechnernamens notwendig" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statischen Rechnernamen festlegen" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Authentifizierung ist erforderlich, um den statisch geänderten, lokalen " "Rechnernamen, sowie den beschönigten Rechnernamen festzulegen." diff --git a/po/el.po b/po/el.po index d96bf16264f..c4225334dfc 100644 --- a/po/el.po +++ b/po/el.po @@ -76,21 +76,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Απαιτείται πιστοποίηση για να ορίσετε την ώρα του συστήματος." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ορισμός ονόματος οικοδεσπότη" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Απαιτείται πιστοποίηση για να ορίσετε τοπικά όνομα οικοδεσπότη." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ορισμός στατικού ονόματος οικοδεσπότη" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Απαιτείται πιστοποίηση για να ορίσετε το στατικά ρυθμισμένο όνομα τοπικού " "οικοδεσπότη, καθώς και το pretty όνομα οικοδεσπότη." diff --git a/po/es.po b/po/es.po index aa586a729d9..adfe827bc4f 100644 --- a/po/es.po +++ b/po/es.po @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Se requiere autenticación para recargar el estado de systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Establecer el nombre del equipo" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Se requiere autenticación para establecer el nombre del equipo local." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Establecer nombre estático del equipo" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Se requiere autenticación para establecer el nombre estático de equipo " "local, así como el nombre visible del equipo." diff --git a/po/fr.po b/po/fr.po index 0c5e0530184..0999cf9dce7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -125,21 +125,21 @@ msgstr "" "d'un utilisateur." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Définir le nom d'hôte" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Authentification requise pour définir le nom d'hôte local." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Définir le nom d'hôte statique" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Authentification requise pour définir le nom d'hôte local de manière " "statique, tout comme le nom d'hôte familier." diff --git a/po/gl.po b/po/gl.po index 7796154aa7a..147d34da845 100644 --- a/po/gl.po +++ b/po/gl.po @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Requírese autenticación para recargar o estado de systemd." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Estabelecer o nome do equipo" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Requírese autenticación para estabelecer o nome local do equiupo." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Estabelecer o nome do equipo estático" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Requírese autenticación para estabelecer de forma o nome do equipo local " "estabelecido de forma estática, así como o nome do equipo lexíbel por " diff --git a/po/hr.po b/po/hr.po index d77fee7df93..8385d5ae94b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -118,21 +118,21 @@ msgid "" msgstr "Potrebna je ovjera za promjenu lozinke osobnog prostora korisnika." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Postavi naziv računala" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Potrebna je ovjera za postavljanje naziva lokalnog računala." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Postavi nepromjenjivi naziv račumala" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Potrebna je ovjera za postavljenje nepromjenjivog naziva lokalnog računala, " "kao i prijatnog naziva računala." diff --git a/po/hu.po b/po/hu.po index c9c8bc786fa..e4e5d540b72 100644 --- a/po/hu.po +++ b/po/hu.po @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Hitelesítés szükséges a systemd állapotának újratöltéséhez." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Gépnév beállítása" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Hitelesítés szükséges a helyi gépnév beállításához." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statikus gépnév beállítása" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Hitelesítés szükséges a statikusan megadott helyi gépnév, valamint a szép " "gépnév beállításához." diff --git a/po/id.po b/po/id.po index 66dd11ec776..efc2ad700ed 100644 --- a/po/id.po +++ b/po/id.po @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Otentikasi diperlukan untuk memuat ulang keadaan systemd." #: src/hostname/org.freedesktop.hostname1.policy:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Setel nama host" #: src/hostname/org.freedesktop.hostname1.policy:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Otentikasi diperlukan untuk menata nama host lokal." #: src/hostname/org.freedesktop.hostname1.policy:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Setel nama host statik" #: src/hostname/org.freedesktop.hostname1.policy:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Otentikasi diperlukan untuk menata nama host lokal yang dikonfigurasi " "statik, maupun nama host cantik." diff --git a/po/it.po b/po/it.po index 1410586999b..a2f45bd1d98 100644 --- a/po/it.po +++ b/po/it.po @@ -124,21 +124,21 @@ msgstr "" "dell'utente." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Configura il nome host" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autenticazione richiesta per configurare il nome host locale." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Configura il nome host statico" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autenticazione richiesta per configurare staticamente il nome host locale e " "il nome host descrittivo." diff --git a/po/ja.po b/po/ja.po index 0847af1f710..7662bec2e99 100644 --- a/po/ja.po +++ b/po/ja.po @@ -110,21 +110,21 @@ msgid "Authentication is required to change the password of a user's home area." msgstr "ユーザのホーム領域のパスワードを変更するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "ホスト名の設定" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "ホスト名を設定するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "静的なホスト名の設定" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "静的なホスト名を設定するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:41 diff --git a/po/ko.po b/po/ko.po index 53899fd9efc..301a322406f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "systemd 상태를 다시 불러오려면 인증이 필요합니다." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "호스트 이름 설정" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "로컬 호스트 이름을 설정하려면 인증이 필요합니다." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "정적 호스트 이름 설정" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "로컬 호스트 이름을 모양새를 갖춘 호스트 이름 처럼 정적으로 설정하려면 인증" "이 필요합니다." diff --git a/po/lt.po b/po/lt.po index 3350b56ee16..2f03fd65eca 100644 --- a/po/lt.po +++ b/po/lt.po @@ -68,22 +68,22 @@ msgid "Authentication is required to reload the systemd state." msgstr "Norint iš naujo įkelti systemd būseną, reikia patvirtinti tapatybę." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Nustatyti serverio pavadinimą" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "" "Norint nustatyti vietinio serverio pavadinimą, reikia nustatyti tapatybę." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nustatyti statinį serverio pavadinimą" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Norint nustatyti statiškai sukonfigūruotą serverio pavadinimą, o taip pat " "lengvai įsimenamą serverio pavadinimą, reikia nustatyti tapatybę." diff --git a/po/pl.po b/po/pl.po index 3f7044ada76..367d003ad2d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -130,21 +130,21 @@ msgstr "" "użytkownika." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Ustawienie nazwy komputera" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Wymagane jest uwierzytelnienie, aby ustawić nazwę lokalnego komputera." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ustawienie statycznej nazwy komputera" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Wymagane jest uwierzytelnienie, aby ustawić statycznie skonfigurowaną nazwę " "lokalnego komputera, a także jego nazwę czytelną dla człowieka." diff --git a/po/pt_BR.po b/po/pt_BR.po index 06706fe8fca..09964a12969 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -74,21 +74,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "É necessária autenticação para recarregar o estado do sistema." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Definir nome de máquina" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "É necessária autenticação para definir nome de máquina local." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Definir nome estático de máquina" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "É necessária autenticação para definir o nome de máquina local configurado " "estaticamente, assim como o nome apresentável de máquina." diff --git a/po/ro.po b/po/ro.po index e22f1a110a6..869cf6b625f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -73,21 +73,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentificarea este necesară pentru a reîncărca starea systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Stabilește numele de server" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentificarea este necesară pentru a stabili numele de server local." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Stabilește numele de server static" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentificarea este necesara pentru a stabili numele de server static " "configurat local, precum și numele lung de server." diff --git a/po/ru.po b/po/ru.po index 35da66eefb9..f13c51f302d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -134,21 +134,21 @@ msgstr "" " пройти аутентификацию." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Настроить имя компьютера" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Чтобы настроить имя компьютера, необходимо пройти аутентификацию." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Настроить статическое имя компьютера" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Чтобы настроить статическое имя компьютера, а также его «красивое» имя, " "необходимо пройти аутентификацию." diff --git a/po/sk.po b/po/sk.po index ced96e8045a..971df90b28c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -72,21 +72,21 @@ msgstr "" "Vyžaduje sa overenie totožnosti na znovu načítanie stavu systému systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Nastavenie názvu hostiteľa" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Vyžaduje sa overenie totožnosti na nastavenie názvu hostiteľa." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nastavenie nemenného názvu hostiteľa" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Vyžaduje sa overenie totožnosti na nastavenie pevne určeného názvu miestneho " "hostiteľa, známeho ako zrozumiteľný názov hostiteľa." diff --git a/po/sr.po b/po/sr.po index 3d0bebd5036..a62f5cffe60 100644 --- a/po/sr.po +++ b/po/sr.po @@ -72,21 +72,21 @@ msgstr "" "Потребно је да се идентификујете да бисте поново учитали стање систем-деа." #: src/hostname/org.freedesktop.hostname1.policy.in:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Постави назив машине" #: src/hostname/org.freedesktop.hostname1.policy.in:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Потребно је да се идентификујете да бисте поставили назив машине." #: src/hostname/org.freedesktop.hostname1.policy.in:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Постави статички назив машине" #: src/hostname/org.freedesktop.hostname1.policy.in:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Потребно је да се идентификујете да бисте поставили статички назив машине и " "да бисте поставили леп назив машине." diff --git a/po/sv.po b/po/sv.po index 5f40d455ab3..c8bd2ae2742 100644 --- a/po/sv.po +++ b/po/sv.po @@ -68,21 +68,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentisering krävs för att läsa om tillståndet för systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ange värdnamn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentisering krävs för att ställa in lokalt värdnamn." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ange statiskt värdnamn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentisering krävs för att ställa in det statiskt konfigurerade lokala " "värdnamnet såväl som det stiliga värdnamnet." diff --git a/po/tr.po b/po/tr.po index 86c13448e23..b2af9e90045 100644 --- a/po/tr.po +++ b/po/tr.po @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "systemd durumunu yeniden yüklemek kimlik doğrulaması gerektiriyor." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Makine adını ayarla" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Yerel makine adını ayarlamak kimlik doğrulaması gerektiriyor." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statik makine adı ayarla" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Statik olarak yapılandırılmış konak makine adını ve yerel makine adını " "ayarlamak kimlik doğrulaması gerektiriyor." diff --git a/po/uk.po b/po/uk.po index aca1cf735c2..f0a702802f9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -126,21 +126,21 @@ msgstr "" "розпізнавання." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Встановити назву вузла" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Потрібна автентифікація, щоб встановити назву локального вузла." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Встановити статичну назву вузла" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Потрібна автентифікація, щоб вказати статично налаштовану назву локального " "вузла, так само й форматовану." diff --git a/po/zh_CN.po b/po/zh_CN.po index 7196cc50bff..2655f62c694 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -64,15 +64,15 @@ msgid "Authentication is required to reload the systemd state." msgstr "重新载入 systemd 状态需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "设置主机名" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "设置本地主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "设置静态主机名" # For pretty hostname, the zh_CN/zh_TW translation should be discussed again. @@ -81,8 +81,8 @@ msgstr "设置静态主机名" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 #, fuzzy msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "设置静态本地主机名或美观主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5 diff --git a/po/zh_TW.po b/po/zh_TW.po index d14a338e5c4..ac6cd99efa4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -62,21 +62,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "重新載入 systemd 狀態需要驗證。" #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "設定主機名稱" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "設定主機名稱需要驗證。" #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "設定靜態主機名稱" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "設定靜態預先設定或 pretty 本地主機名稱需要身份驗證。" #: src/hostname/org.freedesktop.hostname1.policy:41 diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c index 7bc2e3f370f..8932c552c86 100644 --- a/src/basic/hostname-util.c +++ b/src/basic/hostname-util.c @@ -21,7 +21,7 @@ bool hostname_is_set(void) { if (isempty(u.nodename)) return false; - /* This is the built-in kernel default host name */ + /* This is the built-in kernel default hostname */ if (streq(u.nodename, "(none)")) return false; @@ -77,7 +77,7 @@ bool valid_ldh_char(char c) { } /** - * Check if s looks like a valid host name or FQDN. This does not do + * Check if s looks like a valid hostname or FQDN. This does not do * full DNS validation, but only checks if the name is composed of * allowed characters and the length is not above the maximum allowed * by Linux (c.f. dns_name_is_valid()). Trailing dot is allowed if diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 2daaaf99717..7507479ce27 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -186,7 +186,7 @@ int unit_name_printf(const Unit *u, const char* format, char **ret) { * %u: the username of the running user * * %m: the machine ID of the running system - * %H: the host name of the running system + * %H: the hostname of the running system * %b: the boot ID of the running system */ diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 901fbf08159..488e87beae6 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -691,7 +691,7 @@ static int help(void) { " --locale-messages=LOCALE Set message locale (LC_MESSAGES=)\n" " --keymap=KEYMAP Set keymap\n" " --timezone=TIMEZONE Set timezone\n" - " --hostname=NAME Set host name\n" + " --hostname=NAME Set hostname\n" " --machine-ID=ID Set machine ID\n" " --root-password=PASSWORD Set root password\n" " --root-password-file=FILE Set root password from file\n" diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 66af1c0b5c1..448492bb8da 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -280,7 +280,7 @@ static int context_update_kernel_hostname(Context *c) { if (hostname_is_useful(static_hn)) hn = static_hn; - /* ... the transient host name, (ie: DHCP) comes next ... */ + /* ... the transient hostname, (ie: DHCP) comes next ... */ else if (!isempty(c->data[PROP_HOSTNAME])) hn = c->data[PROP_HOSTNAME]; @@ -454,11 +454,11 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * r = context_update_kernel_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to set host name: %m"); + log_error_errno(r, "Failed to set hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %m"); } - log_info("Changed host name to '%s'", strna(c->data[PROP_HOSTNAME])); + log_info("Changed hostname to '%s'", strna(c->data[PROP_HOSTNAME])); (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/hostname1", "org.freedesktop.hostname1", "Hostname", NULL); @@ -506,17 +506,17 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ r = context_update_kernel_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to set host name: %m"); + log_error_errno(r, "Failed to set hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %m"); } r = context_write_data_static_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to write static host name: %m"); + log_error_errno(r, "Failed to write static hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set static hostname: %m"); } - log_info("Changed static host name to '%s'", strna(c->data[PROP_STATIC_HOSTNAME])); + log_info("Changed static hostname to '%s'", strna(c->data[PROP_STATIC_HOSTNAME])); (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/hostname1", "org.freedesktop.hostname1", "StaticHostname", NULL); @@ -547,7 +547,7 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (prop == PROP_ICON_NAME && !filename_is_valid(name)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid icon name '%s'", name); if (prop == PROP_PRETTY_HOSTNAME && string_has_cc(name, NULL)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty host name '%s'", name); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty hostname '%s'", name); if (prop == PROP_CHASSIS && !valid_chassis(name)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid chassis '%s'", name); if (prop == PROP_DEPLOYMENT && !valid_deployment(name)) @@ -585,7 +585,7 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess } log_info("Changed %s to '%s'", - prop == PROP_PRETTY_HOSTNAME ? "pretty host name" : + prop == PROP_PRETTY_HOSTNAME ? "pretty hostname" : prop == PROP_DEPLOYMENT ? "deployment" : prop == PROP_LOCATION ? "location" : prop == PROP_CHASSIS ? "chassis" : "icon name", strna(c->data[prop])); diff --git a/src/hostname/org.freedesktop.hostname1.policy b/src/hostname/org.freedesktop.hostname1.policy index 5bedc0b6942..5969a82b299 100644 --- a/src/hostname/org.freedesktop.hostname1.policy +++ b/src/hostname/org.freedesktop.hostname1.policy @@ -17,8 +17,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Set host name - Authentication is required to set the local host name. + Set hostname + Authentication is required to set the local hostname. auth_admin_keep auth_admin_keep @@ -27,8 +27,8 @@ - Set static host name - Authentication is required to set the statically configured local host name, as well as the pretty host name. + Set static hostname + Authentication is required to set the statically configured local hostname, as well as the pretty hostname. auth_admin_keep auth_admin_keep diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 64cb3279f64..6bf68695435 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1746,7 +1746,7 @@ static int server_open_hostname(Server *s) { r = sd_event_source_set_priority(s->hostname_event_source, SD_EVENT_PRIORITY_IMPORTANT-10); if (r < 0) - return log_error_errno(r, "Failed to adjust priority of host name event source: %m"); + return log_error_errno(r, "Failed to adjust priority of hostname event source: %m"); return 0; } diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 5154af23049..39e6ac1d6a2 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -683,7 +683,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void case SD_DHCP_OPTION_HOST_NAME: r = lease_parse_domain(option, len, &lease->hostname); if (r < 0) { - log_debug_errno(r, "Failed to parse host name, ignoring: %m"); + log_debug_errno(r, "Failed to parse hostname, ignoring: %m"); return 0; } diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 8c16b7f360c..9aa6debc164 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -77,7 +77,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( return NSS_STATUS_TRYAGAIN; } - /* We respond to our local host name, our hostname suffixed with a single dot. */ + /* We respond to our local hostname, our hostname suffixed with a single dot. */ if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) goto not_found; diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index badb0ee7396..8517e662d08 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1115,7 +1115,7 @@ static void bus_method_resolve_service_complete(DnsQuery *q) { if (has_root_domain && found <= 0) { /* If there's exactly one SRV RR and it uses - * the root domain as host name, then the + * the root domain as hostname, then the * service is explicitly not offered on the * domain. Report this as a recognizable * error. See RFC 2782, Section "Usage diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index c2839d425ad..2cb06c098da 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -100,7 +100,7 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) { r = extract_first_word(&line, &name, NULL, EXTRACT_RELAX); if (r < 0) - return log_error_errno(r, "/etc/hosts:%u: couldn't extract host name: %m", nr); + return log_error_errno(r, "/etc/hosts:%u: couldn't extract hostname: %m", nr); if (r == 0) break; @@ -162,7 +162,7 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) { } if (!found) - log_warning("/etc/hosts:%u: line is missing any host names", nr); + log_warning("/etc/hosts:%u: line is missing any hostnames", nr); return 0; } diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 94590e30386..0b510b10f64 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -341,7 +341,7 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char p = h; r = dns_label_unescape(&p, label, sizeof label, 0); if (r < 0) - return log_error_errno(r, "Failed to unescape host name: %m"); + return log_error_errno(r, "Failed to unescape hostname: %m"); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Couldn't find a single label in hostname."); @@ -371,7 +371,7 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char r = dns_label_escape_new(decoded, r, &n); if (r < 0) - return log_error_errno(r, "Failed to escape host name: %m"); + return log_error_errno(r, "Failed to escape hostname: %m"); if (is_localhost(n)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), @@ -411,7 +411,7 @@ static int make_fallback_hostnames(char **full_hostname, char **llmnr_hostname, p = fallback_hostname(); r = dns_label_unescape(&p, label, sizeof label, 0); if (r < 0) - return log_error_errno(r, "Failed to unescape fallback host name: %m"); + return log_error_errno(r, "Failed to unescape fallback hostname: %m"); assert(r > 0); /* The fallback hostname must have at least one label */ diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index 2061384afe3..03184cf7e2a 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -115,7 +115,7 @@ int install_full_printf(const UnitFileInstallInfo *i, const char *format, char * * %U the UID of the running user * %u the username of running user * %m the machine ID of the running system - * %H the host name of the running system + * %H the hostname of the running system * %b the boot ID of the running system * %v `uname -r` of the running system */ From 5d2262d7c3072f7da342f87990e96c560cb7846b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Apr 2020 11:07:35 +0200 Subject: [PATCH 3/7] =?UTF-8?q?man:=20hostname(5)=20=E2=80=94=20add=20desc?= =?UTF-8?q?ription=20of=20methods=20and=20properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- man/org.freedesktop.hostname1.xml | 77 ++++++++++++++++++------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml index f707b9080de..f6eb9f35458 100644 --- a/man/org.freedesktop.hostname1.xml +++ b/man/org.freedesktop.hostname1.xml @@ -89,38 +89,6 @@ node /org/freedesktop/hostname1 { }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -240,6 +208,51 @@ node /org/freedesktop/hostname1 { machine-info3 for that. For more information on these files and syscalls see the respective man pages. + + Methods and Properties + + SetHostname() sets the transient (dynamic) hostname which is exposed by the + Hostname property. If empty, the transient hostname is set to the static hostname. + + + SetStaticHostname() sets the static hostname which is exposed by the + StaticHostname property. If empty, the built-in default of + &FALLBACK_HOSTNAME; is used. + + SetPrettyHostname() sets the pretty hostname which is exposed by the + PrettyHostname property. + + SetIconName(), SetChassis(), + SetDeployment(), and SetLocation() set the properties + IconName (the name of the icon representing for the machine), + Chassis (the machine form factor), Deployment (the system + deployment environment), and Location (physical system location), respectively. + + + PrettyHostname, IconName, Chassis, + Deployment, and Location are stored in + /etc/machine-info. See + machine-info5 for + the semantics of those settings. + + GetProductUUID() returns the "product uuid" as exposed by the kernel based + on DMI information in /sys/class/dmi/id/product_uuid. Reading the file directly + requires root privileges, and this method allows access to unprivileged clients through the PolicyKit + framework. + + KernelName, KernelRelease, and + KernelVersion expose the kernel name (e.g. Linux), release + (e.g. 5.0.0-11, and version (i.e. the build number, e.g. #11) as + reported by + uname2. + OperatingSystemPrettyName, OperatingSystemCPEName, and + HomeURL expose the PRETTY_NAME=, CPE_NAME= and + HOME_URL= fields from + os-release5. The + purpose of those properties is to allow remote clients to access this information over D-Bus. Local + clients can access the information directly. + + Security From 2a9159244b52b3b0810032b31388ac993a624739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Apr 2020 12:32:53 +0200 Subject: [PATCH 4/7] =?UTF-8?q?man:=20timedate1(5)=20=E2=80=94=20add=20mis?= =?UTF-8?q?sing=20descriptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- man/org.freedesktop.timedate1.xml | 51 ++++++++++++++++++------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/man/org.freedesktop.timedate1.xml b/man/org.freedesktop.timedate1.xml index 000c0ca03e6..73bd9dfedd1 100644 --- a/man/org.freedesktop.timedate1.xml +++ b/man/org.freedesktop.timedate1.xml @@ -72,22 +72,6 @@ node /org/freedesktop/timedate1 { }; - - - - - - - - - - - - - - - - @@ -148,16 +132,39 @@ node /org/freedesktop/timedate1 { network using systemd-timesyncd. This will enable and start or disable and stop the chosen time synchronization service. - Whenever the timezone and local_rtc settings are changed via the daemon, - PropertyChanged signals are sent out to which clients can subscribe. Changing the - time settings using this interface is authenticated via PolicyKit. + ListTimezones() returns a list of time zones known on the local system as an + array of names (["Africa/Abidjan", "Africa/Accra", ..., "UTC"]). + + + + Properties + + Timezone shows the currently configured time zone. + LocalRTC shows whether the RTC is configured to use UTC (false), or the local time + zone (true). CanNTP shows whether a service to perform time synchronization over the + network is available, and NTP shows whether such a service is enabled. + + NTPSynchronized shows whether the kernel reports the time as synchronized + (c.f. + adjtimex3). + TimeUSec and RTCTimeUSec show the current time on the system and + in the RTC. The purpose of those three properties is to allow remote clients to access this information + over D-Bus. Local clients can access the information directly. + + Whenever the Timezone and LocalRTC settings are changed via + the daemon, PropertyChanged signals are sent out to which clients can subscribe. + Note that this service will not inform you about system time changes. Use timerfd3 with CLOCK_REALTIME and TFD_TIMER_CANCEL_ON_SET for that. + - The user_interaction boolean parameters can be used to control whether + + Security + + The interactive boolean parameters can be used to control whether PolicyKit should interactively ask the user for authentication credentials if required. The PolicyKit action for SetTimezone() is @@ -166,7 +173,9 @@ node /org/freedesktop/timedate1 { org.freedesktop.timedate1.set-local-rtc, for SetTime() it is org.freedesktop.timedate1.set-time and for SetNTP() it is - org.freedesktop.timedate1.set-ntp. + org.freedesktop.timedate1.set-ntp. + ListTimezones() does not require any privileges. + From 10d5ce0aa5cffe9c16474fde2c8010a5f6ac5db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Apr 2020 13:22:55 +0200 Subject: [PATCH 5/7] man: fix two typos Pointed out by @boucman and @DaanDeMeyer during review. --- man/org.freedesktop.login1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index cd4925b1945..0d686d65a18 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -846,8 +846,8 @@ node /org/freedesktop/login1/seat/seat0 { encoded in a structure consisting of the ID and the object path. The IdleHint, IdleSinceHint, and - IdleSinceHint properties encode the idle state, similar to the one exposed on the - Manager object, but specific for this seat. + IdleSinceHintMonotonic properties encode the idle state, similar to the ones exposed + on the Manager object, but specific for this seat. From 98ab0daeeb07aa3333ff0b1bdba990af6d6e4924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 18 Apr 2020 17:47:51 +0200 Subject: [PATCH 6/7] docs: use "polkit" to refer to PolicyKit See d35f51ea848ca76bd3747db69e8c5dd864e82bc3 for justification. First use in each file is turned into a link to the documentation page. --- NEWS | 2 +- docs/PORTABILITY_AND_STABILITY.md | 2 +- docs/USERDB_AND_DESKTOPS.md | 3 ++- man/org.freedesktop.hostname1.xml | 9 +++++---- man/org.freedesktop.locale1.xml | 9 +++++---- man/org.freedesktop.login1.xml | 15 ++++++++------- man/org.freedesktop.systemd1.xml | 11 ++++++----- man/org.freedesktop.timedate1.xml | 5 +++-- 8 files changed, 31 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index cac6c1b294a..15979ae34d5 100644 --- a/NEWS +++ b/NEWS @@ -280,7 +280,7 @@ CHANGES WITH 245: such files in version 243. * systemd-logind will now validate access to the operation of changing - the virtual terminal via a PolicyKit action. By default, only users + the virtual terminal via a polkit action. By default, only users with at least one session on a local VT are granted permission. * When systemd sets up PAM sessions that invoked service processes diff --git a/docs/PORTABILITY_AND_STABILITY.md b/docs/PORTABILITY_AND_STABILITY.md index 95bfcb98d38..064932970ff 100644 --- a/docs/PORTABILITY_AND_STABILITY.md +++ b/docs/PORTABILITY_AND_STABILITY.md @@ -87,7 +87,7 @@ And now, here's the list of (hopefully) all APIs that we have introduced with sy | [Boot Loader interface](https://systemd.io/BOOT_LOADER_INTERFACE) | EFI variables | yes | yes | gummiboot | yes | - | no | | [Service bus API](https://www.freedesktop.org/wiki/Software/systemd/dbus) | D-Bus | yes | yes | system-config-services | no | - | no | | [logind](https://www.freedesktop.org/wiki/Software/systemd/logind) | D-Bus | yes | yes | GNOME | no | - | no | -| [sd-login.h API](https://www.freedesktop.org/software/systemd/man/sd-login.html) | C Library | yes | yes | GNOME, PolicyKit, ... | no | - | no | +| [sd-login.h API](https://www.freedesktop.org/software/systemd/man/sd-login.html) | C Library | yes | yes | GNOME, polkit, ... | no | - | no | | [sd-daemon.h API](https://www.freedesktop.org/software/systemd/man/sd-daemon.html) | C Library or Drop-in | yes | yes | numerous | yes | - | yes | | [sd-id128.h API](https://www.freedesktop.org/software/systemd/man/sd-id128.html) | C Library | yes | yes | - | yes | - | no | | [sd-journal.h API](https://www.freedesktop.org/software/systemd/man/sd-journal.html) | C Library | yes | yes | - | maybe | - | no | diff --git a/docs/USERDB_AND_DESKTOPS.md b/docs/USERDB_AND_DESKTOPS.md index 6859c59da13..a19f746a26f 100644 --- a/docs/USERDB_AND_DESKTOPS.md +++ b/docs/USERDB_AND_DESKTOPS.md @@ -77,7 +77,8 @@ supports is directly available in these JSON records. Hence it makes sense for any user management UI to expose them directly. `systemd-homed` exposes APIs to add, remove and make changes to local users via -D-Bus, with full PolicyKit hook-up. On the command line this is exposed via the +D-Bus, with full [polkit](https://www.freedesktop.org/software/polkit/docs/latest/) +hook-up. On the command line this is exposed via the `homectl` command. A graphical UI that exposes similar functionality would be very useful, exposing the various new account settings, and in particular providing a stream-lined UI for enrolling new-style authentication tokens such diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml index f6eb9f35458..406a6a369e9 100644 --- a/man/org.freedesktop.hostname1.xml +++ b/man/org.freedesktop.hostname1.xml @@ -141,7 +141,8 @@ node /org/freedesktop/hostname1 { Whenever the hostname or other metadata is changed via the daemon, PropertyChanged signals are sent out to subscribed clients. Changing a hostname - using this interface is authenticated via PolicyKit. + using this interface is authenticated via + polkit. @@ -237,7 +238,7 @@ node /org/freedesktop/hostname1 { GetProductUUID() returns the "product uuid" as exposed by the kernel based on DMI information in /sys/class/dmi/id/product_uuid. Reading the file directly - requires root privileges, and this method allows access to unprivileged clients through the PolicyKit + requires root privileges, and this method allows access to unprivileged clients through the polkit framework. KernelName, KernelRelease, and @@ -256,10 +257,10 @@ node /org/freedesktop/hostname1 { Security - The interactive boolean parameters can be used to control whether PolicyKit + The interactive boolean parameters can be used to control whether polkit should interactively ask the user for authentication credentials if required. - The PolicyKit action for SetHostname() is + The polkit action for SetHostname() is org.freedesktop.hostname1.set-hostname. For SetStaticHostname() and SetPrettyHostname() it is org.freedesktop.hostname1.set-static-hostname. For diff --git a/man/org.freedesktop.locale1.xml b/man/org.freedesktop.locale1.xml index 52f9abcf9d7..f15945e766a 100644 --- a/man/org.freedesktop.locale1.xml +++ b/man/org.freedesktop.locale1.xml @@ -126,7 +126,8 @@ node /org/freedesktop/locale1 { Use the empty string for the keymap parameters you wish not to set. - The interactive boolean parameters can be used to control whether PolicyKit + The interactive boolean parameters can be used to control whether + polkit should interactively ask the user for authentication credentials if required. @@ -160,9 +161,9 @@ node /org/freedesktop/locale1 { Security - Changing the system locale or keymap using this interface is authenticated via PolicyKit. The - PolicyKit action for SetLocale() is - org.freedesktop.locale1.set-locale. The PolicyKit action for + Changing the system locale or keymap using this interface is authenticated via polkit. The + polkit action for SetLocale() is + org.freedesktop.locale1.set-locale. The polkit action for SetX11Keyboard() and SetVConsoleKeyboard() is org.freedesktop.locale1.set-keyboard. diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index 0d686d65a18..e5521e155a4 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -499,19 +499,20 @@ node /org/freedesktop/login1 { directory of a user is kept around and he may continue to run processes while he is logged out. If disabled, the runtime directory goes away as soon as they log out. SetUserLinger() expects three arguments: the UID, a boolean whether to enable/disable and a boolean controlling the - PolicyKit authorization interactivity (see below). Note that the user linger state is persistently + polkit + authorization interactivity (see below). Note that the user linger state is persistently stored on disk. AttachDevice() may be used to assign a specific device to a specific seat. The device is identified by its /sys path and must be eligible for seat assignments. AttachDevice() takes three - arguments: the seat id, the sysfs path, and a boolean for controlling PolicyKit interactivity (see + arguments: the seat id, the sysfs path, and a boolean for controlling polkit interactivity (see below). Device assignments are persistently stored on disk. To create a new seat, simply specify a previously unused seat id. For more information about the seat assignment logic see Multi-Seat for Linux. FlushDevices() removes all explicit seat assignments for devices, resetting - all assignments to the automatic defaults. The only argument it takes is the PolicyKit interactivity + all assignments to the automatic defaults. The only argument it takes is the polkit interactivity boolean (see below). PowerOff(), Reboot(), Halt(), @@ -521,9 +522,9 @@ node /org/freedesktop/login1 { the machine is powered down). HybridSleep() results in the system entering a hybrid-sleep mode, i.e. the system is both hibernated and suspended. SuspendThenHibernate() results in the system being suspended, then later woken - using an RTC timer and hibernated. The only argument is the PolicyKit interactivity boolean + using an RTC timer and hibernated. The only argument is the polkit interactivity boolean interactive (see below). The main purpose of these calls is that they enforce - PolicyKit policy and hence allow powering off/rebooting/suspending/hibernating even by unprivileged + polkit policy and hence allow powering off/rebooting/suspending/hibernating even by unprivileged users. They also enforce inhibition locks. UIs should expose these calls as the primary mechanism to poweroff/reboot/suspend/hibernate the machine. @@ -678,7 +679,7 @@ node /org/freedesktop/login1 { Security - A number of operations are protected via the PolicyKit privilege + A number of operations are protected via the polkit privilege system. SetUserLinger() requires the org.freedesktop.login1.set-user-linger privilege. AttachDevice() requires @@ -731,7 +732,7 @@ node /org/freedesktop/login1 { org.freedesktop.login1.inhibit-handle-lid-switch depending on the lock type and mode taken. - The interactive boolean parameters can be used to control whether PolicyKit + The interactive boolean parameters can be used to control whether polkit should interactively ask the user for authentication credentials if required. diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 996c7179048..da5541be900 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -40,9 +40,10 @@ Properties exposing time values are usually encoded in microseconds (usec) on the bus, even if their corresponding settings in the unit files are in seconds. - In contrast to most of the other services of the systemd suite, PID 1 does not use PolicyKit for - controlling access to privileged operations, but relies exclusively on the low-level D-Bus policy - language. (This is done in order to avoid a cyclic dependency between PolicyKit and systemd/PID 1.) This + In contrast to most of the other services of the systemd suite, PID 1 does not use + polkit + for controlling access to privileged operations, but relies exclusively on the low-level D-Bus policy + language. (This is done in order to avoid a cyclic dependency between polkit and systemd/PID 1.) This means that sensitive operations exposed by PID 1 on the bus are generally not available to unprivileged processes directly. However, some operations (such as shutdown/reboot/suspend) are made available through the D-Bus API of logind, see @@ -1463,7 +1464,7 @@ node /org/freedesktop/systemd1 { Security Read access is generally granted to all clients. Additionally, for unprivileged clients, some - operations are allowed through the PolicyKit privilege system. Operations which modify unit state + operations are allowed through the polkit privilege system. Operations which modify unit state (StartUnit(), StopUnit(), KillUnit(), RestartUnit() and similar, SetProperty) require org.freedesktop.systemd1.manage-units. Operations which modify unit file @@ -2127,7 +2128,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { allowed for everyone. All operations are allowed for clients with the CAP_SYS_ADMIN capability or when the org.freedesktop.systemd1.manage-units privilege is granted by - PolicyKit. + polkit. diff --git a/man/org.freedesktop.timedate1.xml b/man/org.freedesktop.timedate1.xml index 73bd9dfedd1..3111ebbc422 100644 --- a/man/org.freedesktop.timedate1.xml +++ b/man/org.freedesktop.timedate1.xml @@ -165,9 +165,10 @@ node /org/freedesktop/timedate1 { Security The interactive boolean parameters can be used to control whether - PolicyKit should interactively ask the user for authentication credentials if required. + polkit + should interactively ask the user for authentication credentials if required. - The PolicyKit action for SetTimezone() is + The polkit action for SetTimezone() is org.freedesktop.timedate1.set-timezone. For SetLocalRTC() it is org.freedesktop.timedate1.set-local-rtc, for From beb1d286542fe105a16005aa05d62d7f41f221b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Apr 2020 11:15:33 +0200 Subject: [PATCH 7/7] man: remove gendered pronoun and reindent a paragraph --- man/org.freedesktop.login1.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/man/org.freedesktop.login1.xml b/man/org.freedesktop.login1.xml index e5521e155a4..aedf5d7fc32 100644 --- a/man/org.freedesktop.login1.xml +++ b/man/org.freedesktop.login1.xml @@ -496,7 +496,7 @@ node /org/freedesktop/login1 { and seat are identified by their respective IDs. SetUserLinger() enables or disables user lingering. If enabled, the runtime - directory of a user is kept around and he may continue to run processes while he is logged out. If + directory of a user is kept around and they may continue to run processes while logged out. If disabled, the runtime directory goes away as soon as they log out. SetUserLinger() expects three arguments: the UID, a boolean whether to enable/disable and a boolean controlling the polkit @@ -504,10 +504,11 @@ node /org/freedesktop/login1 { stored on disk. AttachDevice() may be used to assign a specific device to a specific - seat. The device is identified by its /sys path and must be eligible for seat assignments. AttachDevice() takes three - arguments: the seat id, the sysfs path, and a boolean for controlling polkit interactivity (see - below). Device assignments are persistently stored on disk. To create a new seat, simply specify a - previously unused seat id. For more information about the seat assignment logic see + seat. The device is identified by its /sys path and must be eligible for seat + assignments. AttachDevice() takes three arguments: the seat id, the sysfs path, + and a boolean for controlling polkit interactivity (see below). Device assignments are persistently + stored on disk. To create a new seat, simply specify a previously unused seat id. For more information + about the seat assignment logic see Multi-Seat for Linux.