From 53dc5fbc41af3d558b5282ecaa049c31e2a0a296 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 6 Jan 2020 18:15:07 +0100 Subject: [PATCH] man: change links to container interface doc to https://systemd.io/ Now that we converted the documentation we should also link to it. --- man/systemd-getty-generator.xml | 35 ++++++++++++-------------------- man/systemd-machine-id-setup.xml | 9 +++----- man/systemd-nspawn.xml | 3 +-- man/systemd.xml | 7 +++---- 4 files changed, 20 insertions(+), 34 deletions(-) diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml index 4cc664dbdd2..efd490bf3a5 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -28,29 +28,20 @@ Description - systemd-getty-generator is a generator - that automatically instantiates - serial-getty@.service on the kernel - console(s), if they can function as ttys and are not provided by - the virtual console subsystem. It will also instantiate - serial-getty@.service instances for - virtualizer consoles, if execution in a virtualized environment is - detected. If execution in a container environment is detected, it - will instead enable console-getty.service for - /dev/console, and - container-getty@.service instances for - additional container pseudo TTYs as requested by the container - manager (see Container - Interface). 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 console= to get both - kernel messages and a getty prompt on a serial TTY. See systemd-getty-generator is a generator that automatically instantiates + serial-getty@.service on the kernel console(s), if they can function as ttys and are + not provided by the virtual console subsystem. It will also instantiate + serial-getty@.service instances for virtualizer consoles, if execution in a + virtualized environment is detected. If execution in a container environment is detected, it will instead + enable console-getty.service for /dev/console, and + container-getty@.service instances for additional container pseudo TTYs as requested + by the container manager (see Container + Interface). 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 console= to + get both kernel messages and a getty prompt on a serial TTY. See kernel-parameters.txt - for more information on the console= kernel - parameter. + for more information on the console= kernel parameter. systemd-getty-generator implements systemd.generator7. diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 31e0cdcf91f..7caf35f8e8e 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. - 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 Container - Interface. + 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 Container Interface. Otherwise, a new ID is randomly generated. diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index d5403f360a3..9e6cc8bf1a3 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -111,8 +111,7 @@ container. systemd-nspawn implements the Container Interface - specification. + url="https://systemd.io/CONTAINER_INTERFACE">Container Interface specification. While running, containers invoked with systemd-nspawn are registered with the systemd-machined8 service that diff --git a/man/systemd.xml b/man/systemd.xml index fdfabcba49f..8c8dc0bd75c 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 systemd.generator7. - Systems which invoke systemd in a container or initrd - environment should implement the - Container Interface or - initrd Interface + Systems which invoke systemd in a container or initrd environment should implement the Container Interface or initrd Interface specifications, respectively. -- 2.39.5