summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-01-06 18:15:07 +0100
committerLennart Poettering <lennart@poettering.net>2020-01-06 18:15:07 +0100
commit53dc5fbc41af3d558b5282ecaa049c31e2a0a296 (patch)
tree226c2ba0ab3940a043498e81b99a73683b66664d
parent635dea2783a61f905cc57b6f330265a7baa128df (diff)
downloadsystemd-53dc5fbc41af3d558b5282ecaa049c31e2a0a296.tar.gz
man: change links to container interface doc to https://systemd.io/
Now that we converted the documentation we should also link to it.
-rw-r--r--man/systemd-getty-generator.xml35
-rw-r--r--man/systemd-machine-id-setup.xml9
-rw-r--r--man/systemd-nspawn.xml3
-rw-r--r--man/systemd.xml7
4 files changed, 20 insertions, 34 deletions
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 4cc664dbdd..efd490bf3a 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -28,29 +28,20 @@
<refsect1>
<title>Description</title>
- <para><filename>systemd-getty-generator</filename> is a generator
- that automatically instantiates
- <filename>serial-getty@.service</filename> on the kernel
- console(s), if they can function as ttys and are not provided by
- the virtual console subsystem. It will also instantiate
- <filename>serial-getty@.service</filename> instances for
- virtualizer consoles, if execution in a virtualized environment is
- detected. If execution in a container environment is detected, it
- will instead enable <filename>console-getty.service</filename> for
- <filename>/dev/console</filename>, and
- <filename>container-getty@.service</filename> instances for
- additional container pseudo TTYs as requested by the container
- manager (see <ulink
- url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container
- Interface</filename></ulink>). This should ensure that the user is
- shown a login prompt at the right place, regardless of which
- environment the system is started in. For example, it is
- sufficient to redirect the kernel console with a kernel command
- line argument such as <varname>console=</varname> to get both
- kernel messages and a getty prompt on a serial TTY. See <ulink
+ <para><filename>systemd-getty-generator</filename> is a generator that automatically instantiates
+ <filename>serial-getty@.service</filename> on the kernel console(s), if they can function as ttys and are
+ not provided by the virtual console subsystem. It will also instantiate
+ <filename>serial-getty@.service</filename> instances for virtualizer consoles, if execution in a
+ virtualized environment is detected. If execution in a container environment is detected, it will instead
+ enable <filename>console-getty.service</filename> for <filename>/dev/console</filename>, and
+ <filename>container-getty@.service</filename> instances for additional container pseudo TTYs as requested
+ by the container manager (see <ulink url="https://systemd.io/CONTAINER_INTERFACE"><filename>Container
+ Interface</filename></ulink>). This should ensure that the user is shown a login prompt at the right
+ place, regardless of which environment the system is started in. For example, it is sufficient to
+ redirect the kernel console with a kernel command line argument such as <varname>console=</varname> to
+ get both kernel messages and a getty prompt on a serial TTY. See <ulink
url="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt"><filename>kernel-parameters.txt</filename></ulink>
- for more information on the <varname>console=</varname> kernel
- parameter.</para>
+ for more information on the <varname>console=</varname> kernel parameter.</para>
<para><filename>systemd-getty-generator</filename> implements
<citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index 31e0cdcf91..7caf35f8e8 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -55,12 +55,9 @@
and is different for every booted instance of the
VM.</para></listitem>
- <listitem><para>Similarly, if run inside a Linux container
- environment and a UUID is configured for the container, this is
- used to initialize the machine ID. For details, see the
- documentation of the <ulink
- url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
- Interface</ulink>.</para></listitem>
+ <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the
+ container, this is used to initialize the machine ID. For details, see the documentation of the <ulink
+ url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>
<listitem><para>Otherwise, a new ID is randomly
generated.</para></listitem>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d5403f360a..9e6cc8bf1a 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -111,8 +111,7 @@
container.</para>
<para><command>systemd-nspawn</command> implements the <ulink
- url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink>
- specification.</para>
+ url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink> specification.</para>
<para>While running, containers invoked with <command>systemd-nspawn</command> are registered with the
<citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry> service that
diff --git a/man/systemd.xml b/man/systemd.xml
index fdfabcba49..8c8dc0bd75 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -280,10 +280,9 @@
files or parameters passed on the kernel command line. For details, see
<citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
- <para>Systems which invoke systemd in a container or initrd
- environment should implement the
- <ulink url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> or
- <ulink url="https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink>
+ <para>Systems which invoke systemd in a container or initrd environment should implement the <ulink
+ url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink> or <ulink
+ url="https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink>
specifications, respectively.</para>
</refsect1>