From b47013fd77c3058768906e110827b0c1ff8c540c Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 28 May 2022 14:42:17 +0200 Subject: [PATCH 1/3] man/nspawn: fix boot-option related wording --- man/systemd-nspawn.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 8a527269d3..668d907509 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -74,7 +74,7 @@ As a safety check systemd-nspawn will verify the existence of /usr/lib/os-release or /etc/os-release in the container tree before - starting the container (see + starting a container (see os-release5). It might be necessary to add this file to the container tree manually if the OS of the container is too old to contain this file out-of-the-box. @@ -84,8 +84,8 @@ template unit file systemd-nspawn@.service is provided to make this easy, taking the container name as instance identifier. Note that different default options apply when systemd-nspawn is invoked by the template unit file than interactively on the command line. Most importantly the template unit file - makes use of the which is not the default in case systemd-nspawn is - invoked from the interactive command line. Further differences with the defaults are documented along with the + makes use of the option which is not the default in case systemd-nspawn + is invoked from the interactive command line. Further differences with the defaults are documented along with the various supported options below. The machinectl1 tool may @@ -121,7 +121,7 @@ Options - If option is specified, the arguments + If option is specified, the arguments are used as arguments for the init program. Otherwise, COMMAND specifies the program to launch in the container, and the remaining arguments are used as From 3a9d9f2a23e68ba1773d527e87d3db140870a0af Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 28 May 2022 14:55:22 +0200 Subject: [PATCH 2/3] man/nspawn: add a sentence-connecting adverb to machinectl note The recommendation to use machinectl login/shell instead of trying to combine two distinct container instances seemed a litte bit out of context and is now combined via "rather". --- man/systemd-nspawn.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 668d907509..72201d9be5 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -105,7 +105,7 @@ Note that running two systemd-nspawn containers from the same directory tree will not make processes in them see each other. The PID namespace separation of the two containers is complete and the containers - will share very few runtime objects except for the underlying file system. Use + will share very few runtime objects except for the underlying file system. Rather use machinectl1's login or shell commands to request an additional login session in a running container. From 926f2a04fc51e425fe52ee308e08ccb7cafec443 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Mon, 30 May 2022 20:21:48 +0200 Subject: [PATCH 3/3] man/nspawn: os-release is only checked for booted containers /etc/os-release existence is only enforced in --boot mode, therefore the term "starting" (which also applies to chroot-like mode) is substituted with "booting" in this context. --- man/systemd-nspawn.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 72201d9be5..f52968a4f0 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -74,7 +74,7 @@ As a safety check systemd-nspawn will verify the existence of /usr/lib/os-release or /etc/os-release in the container tree before - starting a container (see + booting a container (see os-release5). It might be necessary to add this file to the container tree manually if the OS of the container is too old to contain this file out-of-the-box.