Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 83 insertions, 1 deletions

diff --git a/upstream/opensuse-tumbleweed/man5/systemd.nspawn.5 b/upstream/opensuse-tumbleweed/man5/systemd.nspawn.5
index 40a2ad9b..0c441ba1 100644
--- a/upstream/opensuse-tumbleweed/man5/systemd.nspawn.5
+++ b/upstream/opensuse-tumbleweed/man5/systemd.nspawn.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSTEMD\&.NSPAWN" "5" "" "systemd 254" "systemd.nspawn"
+.TH "SYSTEMD\&.NSPAWN" "5" "" "systemd 255" "systemd.nspawn"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -86,6 +86,8 @@ command line\&. This option may not be combined with
 \fIProcessTwo=yes\fR\&. This option is specified by default in the
 systemd\-nspawn@\&.service
 template unit\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIEphemeral=\fR
@@ -95,6 +97,8 @@ Takes a boolean argument, which defaults to off, If enabled, the container is ru
 command line switch\&. See
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&.
+.sp
+Added in version 240\&.
 .RE
 .PP
 \fIProcessTwo=\fR
@@ -105,6 +109,8 @@ switch on the
 \fBsystemd\-nspawn\fR
 command line\&. This option may not be combined with
 \fIBoot=yes\fR\&.
+.sp
+Added in version 229\&.
 .RE
 .PP
 \fIParameters=\fR
@@ -124,6 +130,8 @@ is the same as
 \fBParameters=b \*(Aqc c\*(Aq\fR
 is the same as
 \fBsystemd\-nspawn \-\-boot b \*(Aqc c\*(Aq\fR\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIEnvironment=\fR
@@ -132,6 +140,8 @@ Takes an environment variable assignment consisting of key and value, separated
 "="\&. Sets an environment variable for the main process invoked in the container\&. This setting may be used multiple times to set multiple environment variables\&. It corresponds to the
 \fB\-\-setenv=\fR
 command line switch\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIUser=\fR
@@ -139,6 +149,8 @@ command line switch\&.
 Takes a UNIX user name\&. Specifies the user name to invoke the main process of the container as\&. This user must be known in the container\*(Aqs user database\&. This corresponds to the
 \fB\-\-user=\fR
 command line switch\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIWorkingDirectory=\fR
@@ -146,6 +158,8 @@ command line switch\&.
 Selects the working directory for the process invoked in the container\&. Expects an absolute path in the container\*(Aqs file system namespace\&. This corresponds to the
 \fB\-\-chdir=\fR
 command line switch\&.
+.sp
+Added in version 229\&.
 .RE
 .PP
 \fIPivotRoot=\fR
@@ -155,6 +169,8 @@ Selects a directory to pivot to
 inside the container when starting up\&. Takes a single path, or a pair of two paths separated by a colon\&. Both paths must be absolute, and are resolved in the container\*(Aqs file system namespace\&. This corresponds to the
 \fB\-\-pivot\-root=\fR
 command line switch\&.
+.sp
+Added in version 233\&.
 .RE
 .PP
 \fICapability=\fR, \fIDropCapability=\fR
@@ -185,6 +201,8 @@ is passed, all capabilities are retained (or dropped)\&.
 .sp
 These settings change the bounding set of capabilities which also limits the ambient capabilities as given with the
 \fIAmbientCapability=\fR\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIAmbientCapability=\fR
@@ -211,6 +229,8 @@ and
 Note that
 \fIAmbientCapability=\fR
 is a privileged setting (see above)\&.
+.sp
+Added in version 248\&.
 .RE
 .PP
 \fINoNewPrivileges=\fR
@@ -222,6 +242,8 @@ flag for the container payload\&. This is equivalent to the
 command line switch\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fIKillSignal=\fR
@@ -230,6 +252,8 @@ Specify the process signal to send to the container\*(Aqs PID 1 when nspawn itse
 \fBBoot=\fR
 is used (on systemd\-compatible init systems SIGRTMIN+3 triggers an orderly shutdown)\&. For a list of valid signals, see
 \fBsignal\fR(7)\&.
+.sp
+Added in version 230\&.
 .RE
 .PP
 \fIPersonality=\fR
@@ -237,6 +261,8 @@ is used (on systemd\-compatible init systems SIGRTMIN+3 triggers an orderly shut
 Configures the kernel personality for the container\&. This is equivalent to the
 \fB\-\-personality=\fR
 switch\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIMachineID=\fR
@@ -244,6 +270,8 @@ switch\&.
 Configures the 128\-bit machine ID (UUID) to pass to the container\&. This is equivalent to the
 \fB\-\-uuid=\fR
 command line switch\&. This option is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIPrivateUsers=\fR
@@ -253,6 +281,8 @@ Configures support for usernamespacing\&. This is equivalent to the
 command line switch, and takes the same options\&. This option is privileged (see above)\&. This option is the default if the
 systemd\-nspawn@\&.service
 template unit file is used\&.
+.sp
+Added in version 230\&.
 .RE
 .PP
 \fINotifyReady=\fR
@@ -262,6 +292,8 @@ Configures support for notifications from the container\*(Aqs init process\&. Th
 command line switch, and takes the same parameters\&. See
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&.
+.sp
+Added in version 231\&.
 .RE
 .PP
 \fISystemCallFilter=\fR
@@ -271,6 +303,8 @@ Configures the system call filter applied to containers\&. This is equivalent to
 command line switch, and takes the same list parameter\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 235\&.
 .RE
 .PP
 \fILimitCPU=\fR, \fILimitFSIZE=\fR, \fILimitDATA=\fR, \fILimitSTACK=\fR, \fILimitCORE=\fR, \fILimitRSS=\fR, \fILimitNOFILE=\fR, \fILimitAS=\fR, \fILimitNPROC=\fR, \fILimitMEMLOCK=\fR, \fILimitLOCKS=\fR, \fILimitSIGPENDING=\fR, \fILimitMSGQUEUE=\fR, \fILimitNICE=\fR, \fILimitRTPRIO=\fR, \fILimitRTTIME=\fR
@@ -280,6 +314,8 @@ Configures various types of resource limits applied to containers\&. This is equ
 command line switch, and takes the same arguments\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fIOOMScoreAdjust=\fR
@@ -289,6 +325,8 @@ Configures the OOM score adjustment value\&. This is equivalent to the
 command line switch, and takes the same argument\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fICPUAffinity=\fR
@@ -298,6 +336,8 @@ Configures the CPU affinity\&. This is equivalent to the
 command line switch, and takes the same argument\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fIHostname=\fR
@@ -307,6 +347,8 @@ Configures the kernel hostname set for the container\&. This is equivalent to th
 command line switch, and takes the same argument\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fIResolvConf=\fR
@@ -318,6 +360,8 @@ in the container shall be handled\&. This is equivalent to the
 command line switch, and takes the same argument\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fITimezone=\fR
@@ -329,6 +373,8 @@ in the container shall be handled\&. This is equivalent to the
 command line switch, and takes the same argument\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fILinkJournal=\fR
@@ -338,6 +384,8 @@ Configures how to link host and container journal setups\&. This is equivalent t
 command line switch, and takes the same parameter\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 239\&.
 .RE
 .PP
 \fISuppressSync=\fR
@@ -347,6 +395,8 @@ Configures whether to suppress disk synchronization for the container payload\&.
 command line switch, and takes the same parameter\&. See
 \fBsystemd-nspawn\fR(1)
 for details\&.
+.sp
+Added in version 250\&.
 .RE
 .SH "[FILES] SECTION OPTIONS"
 .PP
@@ -357,6 +407,8 @@ Settings files may include a [Files] section, which carries various parameters c
 Takes a boolean argument, which defaults to off\&. If specified, the container will be run with a read\-only file system\&. This setting corresponds to the
 \fB\-\-read\-only\fR
 command line switch\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIVolatile=\fR
@@ -366,6 +418,8 @@ Takes a boolean argument, or the special value
 \fB\-\-volatile=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIBind=\fR, \fIBindReadOnly=\fR
@@ -376,6 +430,8 @@ and
 \fB\-\-bind\-ro=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&. This setting is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIBindUser=\fR
@@ -384,6 +440,8 @@ Binds a user from the host into the container\&. This option is equivalent to th
 \fB\-\-bind\-user=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&. This setting is privileged (see above)\&.
+.sp
+Added in version 249\&.
 .RE
 .PP
 \fITemporaryFileSystem=\fR
@@ -396,6 +454,8 @@ mounts\&. This option is equivalent to the command line switch
 \fB\-\-tmpfs=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&. This setting is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIInaccessible=\fR
@@ -404,6 +464,8 @@ Masks the specified file or directory in the container, by over\-mounting it wit
 \fB\-\-inaccessible=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&. This setting is privileged (see above)\&.
+.sp
+Added in version 242\&.
 .RE
 .PP
 \fIOverlay=\fR, \fIOverlayReadOnly=\fR
@@ -414,6 +476,8 @@ and
 \fB\-\-overlay\-ro=\fR, see
 \fBsystemd-nspawn\fR(1)
 for details about the specific options supported\&. This setting is privileged (see above)\&.
+.sp
+Added in version 233\&.
 .RE
 .PP
 \fIPrivateUsersOwnership=\fR
@@ -421,6 +485,8 @@ for details about the specific options supported\&. This setting is privileged (
 Configures whether the ownership of the files and directories in the container tree shall be adjusted to the UID/GID range used, if necessary and user namespacing is enabled\&. This is equivalent to the
 \fB\-\-private\-users\-ownership=\fR
 command line switch\&. This option is privileged (see above)\&.
+.sp
+Added in version 249\&.
 .RE
 .SH "[NETWORK] SECTION OPTIONS"
 .PP
@@ -431,6 +497,8 @@ Settings files may include a [Network] section, which carries various parameters
 Takes a boolean argument, which defaults to off\&. If enabled, the container will run in its own network namespace and not share network interfaces and configuration with the host\&. This setting corresponds to the
 \fB\-\-private\-network\fR
 command line switch\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIVirtualEthernet=\fR
@@ -441,6 +509,8 @@ Takes a boolean argument\&. Configures whether to create a virtual Ethernet conn
 command line switch\&. This option is privileged (see above)\&. This option is the default if the
 systemd\-nspawn@\&.service
 template unit file is used\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIVirtualEthernetExtra=\fR
@@ -452,6 +522,8 @@ command line switch, and may be used multiple times\&. It is independent of
 \fIVirtualEthernet=\fR\&. Note that this option is unrelated to the
 \fIBridge=\fR
 setting below, and thus any connections created this way are not automatically added to any bridge device on the host side\&. This option is privileged (see above)\&.
+.sp
+Added in version 228\&.
 .RE
 .PP
 \fIInterface=\fR
@@ -460,6 +532,8 @@ Takes a space\-separated list of interfaces to add to the container\&. The inter
 \fB\-\-network\-interface=\fR
 command line switch and implies
 \fIPrivate=yes\fR\&. This option is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIMACVLAN=\fR, \fIIPVLAN=\fR
@@ -470,6 +544,8 @@ and
 \fB\-\-network\-ipvlan=\fR
 command line switches and imply
 \fIPrivate=yes\fR\&. These options are privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIBridge=\fR
@@ -481,6 +557,8 @@ and
 and has the effect that the host side of the created virtual Ethernet link is connected to the specified bridge interface\&. This option corresponds to the
 \fB\-\-network\-bridge=\fR
 command line switch\&. This option is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .PP
 \fIZone=\fR
@@ -493,6 +571,8 @@ and has the effect that the host side of the created virtual Ethernet link is co
 "vz\-"\&. This option corresponds to the
 \fB\-\-network\-zone=\fR
 command line switch\&. This option is privileged (see above)\&.
+.sp
+Added in version 230\&.
 .RE
 .PP
 \fIPort=\fR
@@ -502,6 +582,8 @@ Exposes a TCP or UDP port of the container on the host\&. This option correspond
 command line switch, see
 \fBsystemd-nspawn\fR(1)
 for the precise syntax of the argument this option takes\&. This option is privileged (see above)\&.
+.sp
+Added in version 226\&.
 .RE
 .SH "SEE ALSO"
 .PP