From 7b03b44ed9f5f748670aa26193274dae94468149 Mon Sep 17 00:00:00 2001 From: ml <6209465+ml-@users.noreply.github.com> Date: Sun, 12 Feb 2023 00:22:52 +0100 Subject: [PATCH 1/3] nspawn: fix directory in logged error --- src/nspawn/nspawn-bind-user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c index 45ddb59f76..2e3c3c3072 100644 --- a/src/nspawn/nspawn-bind-user.c +++ b/src/nspawn/nspawn-bind-user.c @@ -394,7 +394,7 @@ int bind_user_setup( r = userns_mkdir(root, "/run/host/home", 0755, 0, 0); if (r < 0) - return log_error_errno(r, "Failed to create /run/host/userdb: %m"); + return log_error_errno(r, "Failed to create /run/host/home: %m"); r = userns_mkdir(root, "/run/host/userdb", 0755, 0, 0); if (r < 0) From f39d7d00a31c1867d5fa41b3dd4e6d20665a8f3a Mon Sep 17 00:00:00 2001 From: ml <6209465+ml-@users.noreply.github.com> Date: Sun, 12 Feb 2023 00:30:28 +0100 Subject: [PATCH 2/3] man: fix directory for user home bind mounts --- 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 ca33d82a74..e2c751692f 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1405,7 +1405,7 @@ After=sys-subsystem-net-devices-ens1.device The user's home directory is bind mounted from the host into - /run/hosts/home/. + /run/host/home/. An additional UID/GID mapping is added that maps the host user's UID/GID to a container UID/GID, allocated from the 60514…60577 range. From 6ebfecd073a821c604d42743507c5da2e145e300 Mon Sep 17 00:00:00 2001 From: ml <6209465+ml-@users.noreply.github.com> Date: Sun, 12 Feb 2023 00:54:07 +0100 Subject: [PATCH 3/3] man: fix typos --- man/org.freedesktop.hostname1.xml | 2 +- man/tmpfiles.d.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/org.freedesktop.hostname1.xml b/man/org.freedesktop.hostname1.xml index 7cad9a7624..c5abd2511c 100644 --- a/man/org.freedesktop.hostname1.xml +++ b/man/org.freedesktop.hostname1.xml @@ -370,7 +370,7 @@ node /org/freedesktop/hostname1 { as-is to systemd-hostnamed in which case it will automatically use a suitable fallback. - Uppercase charaacters should be replaced with their lowercase equivalents. + Uppercase characters should be replaced with their lowercase equivalents. diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index c6673a8859..11a61808d6 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -161,7 +161,7 @@ L /tmp/foobar - - - - /dev/null Type - The type consists of a single letter and optionally one or emore modifier characters: a plus sign + The type consists of a single letter and optionally one or more modifier characters: a plus sign (+), exclamation mark (!), minus sign (-), equals sign (=), tilde character (~) and/or caret (^). @@ -533,7 +533,7 @@ w- /proc/sys/vm/swappiness - - - - 10 Mode The file access mode to use when creating this file or directory. If omitted or when set to - -, the default is used: 0755 for directories, 0644 for all other file objects. For + -, the default is used: 0755 for directories, 0644 for all other file objects. For z, Z lines, if omitted or when set to -, the file access mode will not be modified. This parameter is ignored for x, r, R, L, t, and