mirror of
https://github.com/systemd/systemd.git
synced 2025-03-22 06:50:18 +03:00
Merge pull request #2723 from poettering/importd-man
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
commit
51d97007ed
@ -1910,6 +1910,17 @@ MANPAGES_ALIAS += \
|
||||
|
||||
endif
|
||||
|
||||
if ENABLE_IMPORTD
|
||||
MANPAGES += \
|
||||
man/systemd-importd.service.8
|
||||
MANPAGES_ALIAS += \
|
||||
man/systemd-importd.8
|
||||
man/systemd-importd.8: man/systemd-importd.service.8
|
||||
man/systemd-importd.html: man/systemd-importd.service.html
|
||||
$(html-alias)
|
||||
|
||||
endif
|
||||
|
||||
if ENABLE_LOCALED
|
||||
MANPAGES += \
|
||||
man/localectl.1 \
|
||||
@ -2593,6 +2604,7 @@ EXTRA_DIST += \
|
||||
man/systemd-hibernate-resume@.service.xml \
|
||||
man/systemd-hostnamed.service.xml \
|
||||
man/systemd-hwdb.xml \
|
||||
man/systemd-importd.service.xml \
|
||||
man/systemd-inhibit.xml \
|
||||
man/systemd-initctl.service.xml \
|
||||
man/systemd-journal-gatewayd.service.xml \
|
||||
|
||||
@ -57,12 +57,11 @@
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para><command>nss-myhostname</command> is a plugin for the GNU
|
||||
Name Service Switch (NSS) functionality of the GNU C Library
|
||||
(<command>glibc</command>), primarily providing hostname resolution
|
||||
for the locally configured system hostname as returned by
|
||||
<citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>.
|
||||
The precise hostnames resolved by this module are:</para>
|
||||
<para><command>nss-myhostname</command> is a plug-in module for the GNU Name Service Switch (NSS) functionality of
|
||||
the GNU C Library (<command>glibc</command>), primarily providing hostname resolution for the locally configured
|
||||
system hostname as returned by
|
||||
<citerefentry><refentrytitle>gethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>. The precise
|
||||
hostnames resolved by this module are:</para>
|
||||
|
||||
<itemizedlist>
|
||||
<listitem><para>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.</para></listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
<para>Various software relies on an always-resolvable local
|
||||
@ -93,29 +91,25 @@
|
||||
changing <filename>/etc/hosts</filename> is unnecessary, and on
|
||||
many systems, the file becomes entirely optional.</para>
|
||||
|
||||
<para>To activate the NSS modules, <literal>myhostname</literal>
|
||||
has to be added to the line starting with
|
||||
<literal>hosts:</literal> in
|
||||
<filename>/etc/nsswitch.conf</filename>.</para>
|
||||
<para>To activate the NSS modules, add <literal>myhostname</literal> to the line starting with
|
||||
<literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>.</para>
|
||||
|
||||
<para>It is recommended to place <literal>myhostname</literal>
|
||||
last in the <filename>nsswitch.conf</filename> line to make sure
|
||||
that this mapping is only used as fallback, and that any DNS or
|
||||
<filename>/etc/hosts</filename> based mapping takes
|
||||
precedence.</para>
|
||||
<para>It is recommended to place <literal>myhostname</literal> last in the <filename>nsswitch.conf</filename>'
|
||||
<literal>hosts:</literal> line to make sure that this mapping is only used as fallback, and that any DNS or
|
||||
<filename>/etc/hosts</filename> based mapping takes precedence.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Example</title>
|
||||
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
|
||||
file that enables <command>myhostname</command> correctly:</para>
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables
|
||||
<command>nss-myhostname</command> correctly:</para>
|
||||
|
||||
<programlisting>passwd: compat mymachines
|
||||
group: compat mymachines
|
||||
shadow: compat
|
||||
|
||||
hosts: files resolve mymachines <command>myhostname</command>
|
||||
hosts: files mymachines resolve <command>myhostname</command>
|
||||
networks: files
|
||||
|
||||
protocols: db files
|
||||
|
||||
@ -56,42 +56,37 @@
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para><command>nss-mymachines</command> is a plugin for the GNU
|
||||
Name Service Switch (NSS) functionality of the GNU C Library
|
||||
(<command>glibc</command>), providing hostname resolution for
|
||||
container names of containers running locally that are registered
|
||||
with
|
||||
<citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
|
||||
The container names are resolved to the IP addresses of the
|
||||
specific container, ordered by their scope.</para>
|
||||
<para><command>nss-mymachines</command> is a plug-in module for the GNU Name Service Switch (NSS) functionality of
|
||||
the GNU C Library (<command>glibc</command>), providing hostname resolution for the names of containers running
|
||||
locally that are registered with
|
||||
<citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. 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.</para>
|
||||
|
||||
<para>The module also resolves user IDs used by containers to user
|
||||
names indicating the container name, and back.</para>
|
||||
<para>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.</para>
|
||||
|
||||
<para>To activate the NSS modules, <literal>mymachines</literal>
|
||||
has to be added to the lines starting with
|
||||
<literal>hosts:</literal>, <literal>passwd:</literal> and
|
||||
<literal>group:</literal> in
|
||||
<para>To activate the NSS module, add <literal>mymachines</literal> to the lines starting with
|
||||
<literal>hosts:</literal>, <literal>passwd:</literal> and <literal>group:</literal> in
|
||||
<filename>/etc/nsswitch.conf</filename>.</para>
|
||||
|
||||
<para>It is recommended to place <literal>mymachines</literal>
|
||||
near the end of the <filename>nsswitch.conf</filename> lines to
|
||||
make sure that its mappings are only used as fallback, and that any
|
||||
other mappings, such as DNS or <filename>/etc/hosts</filename>
|
||||
based mappings, take precedence.</para>
|
||||
<para>It is recommended to place <literal>mymachines</literal> after the <literal>files</literal> or
|
||||
<literal>compat</literal> entry of the <filename>/etc/nsswitch.conf</filename> lines to make sure that its mappings
|
||||
are preferred over other resolvers such as DNS, but so that <filename>/etc/hosts</filename>,
|
||||
<filename>/etc/passwd</filename> and <filename>/etc/group</filename> based mappings take precedence.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Example</title>
|
||||
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
|
||||
file that enables <command>mymachines</command> correctly:</para>
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables
|
||||
<command>nss-mymachines</command> correctly:</para>
|
||||
|
||||
<programlisting>passwd: compat <command>mymachines</command>
|
||||
group: compat <command>mymachines</command>
|
||||
shadow: compat
|
||||
|
||||
hosts: files resolve <command>mymachines</command> myhostname
|
||||
hosts: files <command>mymachines</command> resolve myhostname
|
||||
networks: files
|
||||
|
||||
protocols: db files
|
||||
|
||||
@ -56,37 +56,36 @@
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para><command>nss-resolve</command> is a plugin module for the
|
||||
GNU Name Service Switch (NSS) functionality of the GNU C Library
|
||||
(<command>glibc</command>) enabling it to resolve host names via
|
||||
the
|
||||
<citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
local network name resolution service.</para>
|
||||
<para><command>nss-resolve</command> is a plug-in module for the GNU Name Service Switch (NSS) functionality of the
|
||||
GNU C Library (<command>glibc</command>) enabling it to resolve host names via the
|
||||
<citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> local network
|
||||
name resolution service. It replaces the <command>nss-dns</command> plug-in module that traditionally resolves
|
||||
hostnames via DNS.</para>
|
||||
|
||||
<para>To activate the NSS module, <literal>resolve</literal>
|
||||
has to be added to the line starting with
|
||||
<literal>hosts:</literal> in
|
||||
<filename>/etc/nsswitch.conf</filename>.</para>
|
||||
<para>To activate the NSS module, add <literal>resolve</literal> to the line starting with
|
||||
<literal>hosts:</literal> in <filename>/etc/nsswitch.conf</filename>.</para>
|
||||
|
||||
<para>It is recommended to place <literal>resolve</literal> early
|
||||
in the <filename>nsswitch.conf</filename> line (but after the
|
||||
<literal>files</literal> entry), replacing the
|
||||
<literal>dns</literal> entry if it exists, to ensure DNS queries
|
||||
are always routed via
|
||||
<para>It is recommended to place <literal>resolve</literal> early in <filename>/etc/nsswitch.conf</filename>'
|
||||
<literal>hosts:</literal> line (but after the <literal>files</literal> or <literal>mymachines</literal> entries),
|
||||
replacing the <literal>dns</literal> entry if it exists, to ensure DNS queries are always routed via
|
||||
<citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
|
||||
<para>Note that <command>nss-resolve</command> will chain-load <command>nss-dns</command> if
|
||||
<filename>systemd-resolved.service</filename> is not running, ensuring that basic DNS resolution continues to work
|
||||
if the service is down.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Example</title>
|
||||
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename>
|
||||
file that enables <command>resolve</command> correctly:</para>
|
||||
<para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables <command>nss-resolve</command>
|
||||
correctly:</para>
|
||||
|
||||
<programlisting>passwd: compat mymachines
|
||||
group: compat mymachines
|
||||
shadow: compat
|
||||
|
||||
hosts: files <command>resolve</command> mymachines myhostname
|
||||
hosts: files mymachines <command>resolve</command> myhostname
|
||||
networks: files
|
||||
|
||||
protocols: db files
|
||||
@ -96,12 +95,6 @@ rpc: db files
|
||||
|
||||
netgroup: nis</programlisting>
|
||||
|
||||
<para>Note that <command>nss-resolve</command> will chain-load
|
||||
<command>nss-dns</command> if
|
||||
<filename>systemd-resolved.service</filename> is not running,
|
||||
ensuring that basic DNS resolution continues to work if the
|
||||
service is down.</para>
|
||||
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
|
||||
82
man/systemd-importd.service.xml
Normal file
82
man/systemd-importd.service.xml
Normal file
@ -0,0 +1,82 @@
|
||||
<?xml version='1.0'?> <!--*-nxml-*-->
|
||||
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
|
||||
<!--
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2016 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<refentry id="systemd-importd.service" conditional='ENABLE_IMPORTD'>
|
||||
|
||||
<refentryinfo>
|
||||
<title>systemd-importd.service</title>
|
||||
<productname>systemd</productname>
|
||||
|
||||
<authorgroup>
|
||||
<author>
|
||||
<contrib>Developer</contrib>
|
||||
<firstname>Lennart</firstname>
|
||||
<surname>Poettering</surname>
|
||||
<email>lennart@poettering.net</email>
|
||||
</author>
|
||||
</authorgroup>
|
||||
</refentryinfo>
|
||||
|
||||
<refmeta>
|
||||
<refentrytitle>systemd-importd.service</refentrytitle>
|
||||
<manvolnum>8</manvolnum>
|
||||
</refmeta>
|
||||
|
||||
<refnamediv>
|
||||
<refname>systemd-importd.service</refname>
|
||||
<refname>systemd-importd</refname>
|
||||
<refpurpose>VM and container image import and export service</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para><filename>systemd-importd.service</filename></para>
|
||||
<para><filename>/usr/lib/systemd/systemd-importd</filename></para>
|
||||
</refsynopsisdiv>
|
||||
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para><command>systemd-importd</command> 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
|
||||
<citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, and provides the implementation for
|
||||
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
|
||||
<command>pull-raw</command>, <command>pull-tar</command>, <command>import-raw</command>,
|
||||
<command>import-tar</command>, <command>export-raw</command>, and <command>export-tar</command> commands.</para>
|
||||
|
||||
<para>See the
|
||||
<ulink url="http://www.freedesktop.org/wiki/Software/systemd/importd">
|
||||
importd D-Bus API Documentation</ulink> for information about the
|
||||
APIs <filename>systemd-importd</filename> provides.</para>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
</para>
|
||||
</refsect1>
|
||||
|
||||
</refentry>
|
||||
@ -8,6 +8,7 @@
|
||||
[Unit]
|
||||
Description=Virtual Machine and Container Download Service
|
||||
Documentation=man:systemd-importd.service(8)
|
||||
Documentation=http://www.freedesktop.org/wiki/Software/systemd/importd
|
||||
|
||||
[Service]
|
||||
ExecStart=@rootlibexecdir@/systemd-importd
|
||||
|
||||
@ -8,6 +8,9 @@
|
||||
[Unit]
|
||||
Description=Network Name Resolution
|
||||
Documentation=man:systemd-resolved.service(8)
|
||||
Documentation=http://www.freedesktop.org/wiki/Software/systemd/resolved
|
||||
Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers
|
||||
Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients
|
||||
After=systemd-networkd.service network.target
|
||||
|
||||
# On kdbus systems we pull in the busname explicitly, because it
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user