shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #26400 from ml-/fix-directory-and-typos

Browse Source 
Fix directory for user home bind mounts in log error and man page
This commit is contained in:
Yu Watanabe 2023-02-12 17:33:41 +09:00 committed by GitHub
commit 939835cebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/org.freedesktop.hostname1.xml
View File

@ -370,7 +370,7 @@ node /org/freedesktop/hostname1 {
as-is to <filename>systemd-hostnamed</filename> in which case it will automatically use a suitable
fallback.</para></listitem>
<listitem><para>Uppercase charaacters should be replaced with their lowercase equivalents.
<listitem><para>Uppercase characters should be replaced with their lowercase equivalents.
</para></listitem>
</itemizedlist></para>

2
man/systemd-nspawn.xml
View File

@ -1405,7 +1405,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
<orderedlist>
<listitem><para>The user's home directory is bind mounted from the host into
<filename>/run/hosts/home/</filename>.</para></listitem>
<filename>/run/host/home/</filename>.</para></listitem>
<listitem><para>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.</para></listitem>

4
man/tmpfiles.d.xml
View File

@ -161,7 +161,7 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<refsect2>
<title>Type</title>
<para>The type consists of a single letter and optionally one or emore modifier characters: a plus sign
<para>The type consists of a single letter and optionally one or more modifier characters: a plus sign
(<literal>+</literal>), exclamation mark (<literal>!</literal>), minus sign (<literal>-</literal>),
equals sign (<literal>=</literal>), tilde character (<literal>~</literal>) and/or caret
(<literal>^</literal>).</para>
@ -533,7 +533,7 @@ w- /proc/sys/vm/swappiness - - - - 10</programlisting></para>
<title>Mode</title>
<para>The file access mode to use when creating this file or directory. If omitted or when set to
<literal>-</literal>, the default is used: 0755 for directories, 0644 for all other file objects. For
<literal>-</literal>, the default is used: 0755 for directories, 0644 for all other file objects. For
<varname>z</varname>, <varname>Z</varname> lines, if omitted or when set to <literal>-</literal>, the
file access mode will not be modified. This parameter is ignored for <varname>x</varname>,
<varname>r</varname>, <varname>R</varname>, <varname>L</varname>, <varname>t</varname>, and

2
src/nspawn/nspawn-bind-user.c
View File

@ -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)