Adding upstream version 4.23.0.upstream/4.23.0

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

1 files changed, 35 insertions, 2 deletions

diff --git a/upstream/archlinux/man1/systemd-vmspawn.1 b/upstream/archlinux/man1/systemd-vmspawn.1
index 85b7c5e0..8bbdc177 100644
--- a/upstream/archlinux/man1/systemd-vmspawn.1
+++ b/upstream/archlinux/man1/systemd-vmspawn.1
@@ -20,7 +20,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-systemd-vmspawn \- Spawn an OS in a virtual machine\&.
+systemd-vmspawn \- Spawn an OS in a virtual machine
 .SH "SYNOPSIS"
 .HP \w'\fBsystemd\-vmspawn\fR\ 'u
 \fBsystemd\-vmspawn\fR [OPTIONS...] [ARGS...]
@@ -40,6 +40,27 @@ The excess arguments are passed as extra kernel command line arguments using SMB
 The following options are understood:
 .SS "Image Options"
 .PP
+\fB\-D\fR, \fB\-\-directory=\fR
+.RS 4
+Directory to use as file system root for the virtual machine\&.
+.sp
+One of either
+\fB\-\-directory=\fR
+or
+\fB\-\-image=\fR
+must be specified\&. If neither are specified
+\fB\-\-directory=\&.\fR
+is assumed\&.
+.sp
+Note: If mounting a non\-root owned directory you may require
+\fB\-\-private\-users=\fR
+to map into the user\*(Aqs subuid namespace\&. An example of how to use
+\fB/etc/subuid\fR
+for this is given later\&.
+.sp
+Added in version 256\&.
+.RE
+.PP
 \fB\-i\fR, \fB\-\-image=\fR
 .RS 4
 Root file system disk image (or device node) for the virtual machine\&.
@@ -137,7 +158,7 @@ to embed a newline, or
 "\ex00"
 to embed a
 \fBNUL\fR
-byte)\&. Note that the invoking shell might already apply unescaping once, hence this might require double escaping!\&.
+byte)\&. Note that the invoking shell might already apply unescaping once, hence this might require double escaping!
 .sp
 Added in version 255\&.
 .RE
@@ -290,6 +311,12 @@ will be ignored by the executable, and needs to be handled by the pager\&.
 This option instructs the pager to not send termcap initialization and deinitialization strings to the terminal\&. It is set by default to allow command output to remain visible in the terminal even after the pager exits\&. Nevertheless, this prevents some pager functionality from working, in particular paged output cannot be scrolled with the mouse\&.
 .RE
 .sp
+Note that setting the regular
+\fI$LESS\fR
+environment variable has no effect for
+\fBless\fR
+invocations by systemd tools\&.
+.sp
 See
 \fBless\fR(1)
 for more discussion\&.
@@ -301,6 +328,12 @@ Override the charset passed to
 \fBless\fR
 (by default
 "utf\-8", if the invoking terminal is determined to be UTF\-8 compatible)\&.
+.sp
+Note that setting the regular
+\fI$LESSCHARSET\fR
+environment variable has no effect for
+\fBless\fR
+invocations by systemd tools\&.
 .RE
 .PP
 \fI$SYSTEMD_PAGERSECURE\fR