From 992afc106dd0ee5ecb02c86dc7fc49a52e4db10a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Feb 2016 16:23:42 +0100 Subject: man: add minimal man page for systemd-importd.service --- man/systemd-importd.service.xml | 82 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 man/systemd-importd.service.xml (limited to 'man') diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml new file mode 100644 index 0000000000..1da065df69 --- /dev/null +++ b/man/systemd-importd.service.xml @@ -0,0 +1,82 @@ + + + + + + + + + systemd-importd.service + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + systemd-importd.service + 8 + + + + systemd-importd.service + systemd-importd + Virtual machine and container import and export service + + + + systemd-importd.service + /usr/lib/systemd/systemd-importd + + + + Description + + systemd-importd is a system service that allows importing, exporting and downloading of + system images suitable for running as VM or containers. It is a companion service for + systemd-machined.service8, and + used to implement machinectl1's + pull-raw, pull-tar, import-raw, + import-tar, export-raw and export-tar commands. + + See the + + importd D-Bus API Documentation for information about the + APIs systemd-importd provides. + + + + See Also + + systemd1, + machinectl1, + systemd-machined.service8, + systemd-nspawn1 + + + + -- cgit v1.2.3-54-g00ecf From 9053aaad4255a1d01a50f8e44784cd7eebe8f95c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Feb 2016 18:24:03 +0100 Subject: man: change recommended order of NSS modules in /etc/nsswitch.conf So far we recommended placing "nss-mymachines" after "nss-resolve" in the order of preference in /etc/nsswitch.conf. This change reverse this order. Rationale: single-label names are resolved via LLMNR by resolved, which has to time out if no peer by that name exists. By placing "nss-mymachines" first (which always responds immediately) we avoid running into this timeout for most containers. Both modules should return the same data if LLMNR is used by the container anyway. While we are at it, improve the man pages of the three NSS modules in other ways a bit. --- man/nss-myhostname.xml | 32 +++++++++++++------------------- man/nss-mymachines.xml | 43 +++++++++++++++++++------------------------ man/nss-resolve.xml | 45 +++++++++++++++++++-------------------------- 3 files changed, 51 insertions(+), 69 deletions(-) (limited to 'man') diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml index 251bdecbad..f8837745ae 100644 --- a/man/nss-myhostname.xml +++ b/man/nss-myhostname.xml @@ -57,12 +57,11 @@ Description - nss-myhostname is a plugin for the GNU - Name Service Switch (NSS) functionality of the GNU C Library - (glibc), primarily providing hostname resolution - for the locally configured system hostname as returned by - gethostname2. - The precise hostnames resolved by this module are: + nss-myhostname is a plug-in module for the GNU Name Service Switch (NSS) functionality of + the GNU C Library (glibc), primarily providing hostname resolution for the locally configured + system hostname as returned by + gethostname2. The precise + hostnames resolved by this module are: The local, configured hostname is resolved to @@ -80,7 +79,6 @@ ordered by their metric. This assigns a stable hostname to the current gateway, useful for referencing it independently of the current network configuration state. - Various software relies on an always-resolvable local @@ -93,29 +91,25 @@ changing /etc/hosts is unnecessary, and on many systems, the file becomes entirely optional. - To activate the NSS modules, myhostname - has to be added to the line starting with - hosts: in - /etc/nsswitch.conf. + To activate the NSS modules, add myhostname to the line starting with + hosts: in /etc/nsswitch.conf. - It is recommended to place myhostname - last in the nsswitch.conf line to make sure - that this mapping is only used as fallback, and that any DNS or - /etc/hosts based mapping takes - precedence. + It is recommended to place myhostname last in the nsswitch.conf' + hosts: line to make sure that this mapping is only used as fallback, and that any DNS or + /etc/hosts based mapping takes precedence. Example - Here is an example /etc/nsswitch.conf - file that enables myhostname correctly: + Here is an example /etc/nsswitch.conf file that enables + nss-myhostname correctly: passwd: compat mymachines group: compat mymachines shadow: compat -hosts: files resolve mymachines myhostname +hosts: files mymachines resolve myhostname networks: files protocols: db files diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml index d2bec763bb..ec047449bf 100644 --- a/man/nss-mymachines.xml +++ b/man/nss-mymachines.xml @@ -56,42 +56,37 @@ Description - nss-mymachines is a plugin for the GNU - Name Service Switch (NSS) functionality of the GNU C Library - (glibc), providing hostname resolution for - container names of containers running locally that are registered - with - systemd-machined.service8. - The container names are resolved to the IP addresses of the - specific container, ordered by their scope. - - The module also resolves user IDs used by containers to user - names indicating the container name, and back. - - To activate the NSS modules, mymachines - has to be added to the lines starting with - hosts:, passwd: and - group: in + nss-mymachines is a plug-in module for the GNU Name Service Switch (NSS) functionality of + the GNU C Library (glibc), providing hostname resolution for the names of containers running + locally that are registered with + systemd-machined.service8. The + container names are resolved to the IP addresses of the specific container, ordered by their scope. This + functionality only applies to containers using network namespacing. + + The module also resolves user and group IDs used by containers to user and group names indicating the + container name, and back. This functionality only applies to containers using user namespacing. + + To activate the NSS module, add mymachines to the lines starting with + hosts:, passwd: and group: in /etc/nsswitch.conf. - It is recommended to place mymachines - near the end of the nsswitch.conf lines to - make sure that its mappings are only used as fallback, and that any - other mappings, such as DNS or /etc/hosts - based mappings, take precedence. + It is recommended to place mymachines after the files or + compat entry of the /etc/nsswitch.conf lines to make sure that its mappings + are preferred over other resolvers such as DNS, but so that /etc/hosts, + /etc/passwd and /etc/group based mappings take precedence. Example - Here is an example /etc/nsswitch.conf - file that enables mymachines correctly: + Here is an example /etc/nsswitch.conf file that enables + nss-mymachines correctly: passwd: compat mymachines group: compat mymachines shadow: compat -hosts: files resolve mymachines myhostname +hosts: files mymachines resolve myhostname networks: files protocols: db files diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index 8b0928145f..d9e56453e8 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -56,37 +56,36 @@ Description - nss-resolve is a plugin module for the - GNU Name Service Switch (NSS) functionality of the GNU C Library - (glibc) enabling it to resolve host names via - the - systemd-resolved8 - local network name resolution service. - - To activate the NSS module, resolve - has to be added to the line starting with - hosts: in - /etc/nsswitch.conf. - - It is recommended to place resolve early - in the nsswitch.conf line (but after the - files entry), replacing the - dns entry if it exists, to ensure DNS queries - are always routed via + 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 + systemd-resolved8 local network + name resolution service. It replaces the nss-dns plug-in module that traditionally resolves + hostnames via DNS. + + To activate the NSS module, add resolve to the line starting with + hosts: in /etc/nsswitch.conf. + + It is recommended to place resolve early in /etc/nsswitch.conf' + hosts: line (but after the files or mymachines entries), + replacing the dns entry if it exists, to ensure DNS queries are always routed via systemd-resolved8. + + Note that nss-resolve will chain-load nss-dns if + systemd-resolved.service is not running, ensuring that basic DNS resolution continues to work + if the service is down. Example - Here is an example /etc/nsswitch.conf - file that enables resolve correctly: + Here is an example /etc/nsswitch.conf file that enables nss-resolve + correctly: passwd: compat mymachines group: compat mymachines shadow: compat -hosts: files resolve mymachines myhostname +hosts: files mymachines resolve myhostname networks: files protocols: db files @@ -96,12 +95,6 @@ rpc: db files netgroup: nis - Note that nss-resolve will chain-load - nss-dns if - systemd-resolved.service is not running, - ensuring that basic DNS resolution continues to work if the - service is down. - -- cgit v1.2.3-54-g00ecf From ecb465354d5d4b3a16ac3c23ac39751c1a4fbd3d Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 23 Feb 2016 13:46:16 -0500 Subject: man: style fixes --- man/systemd-importd.service.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'man') diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml index 1da065df69..8fdced475c 100644 --- a/man/systemd-importd.service.xml +++ b/man/systemd-importd.service.xml @@ -45,7 +45,7 @@ systemd-importd.service systemd-importd - Virtual machine and container import and export service + VM and container image import and export service @@ -58,10 +58,10 @@ systemd-importd is a system service that allows importing, exporting and downloading of system images suitable for running as VM or containers. It is a companion service for - systemd-machined.service8, and - used to implement machinectl1's + systemd-machined.service8, and provides the implementation for + machinectl1's pull-raw, pull-tar, import-raw, - import-tar, export-raw and export-tar commands. + import-tar, export-raw, and export-tar commands. See the -- cgit v1.2.3-54-g00ecf