1
0
mirror of https://github.com/systemd/systemd synced 2026-04-12 18:14:51 +02:00

Compare commits

..

No commits in common. "7e1f61137a4d659d0dc561a77820f869cc1d9700" and "5f02870a74aa3a758115cc9bd6d68f239caf8453" have entirely different histories.

6 changed files with 44 additions and 42 deletions

View File

@ -106,21 +106,21 @@
| swap.target | | v v | | swap.target | | v v |
| | v | remote-cryptsetup.target | | | v | remote-cryptsetup.target |
| | (various low-level (various mounts and | remote-veritysetup.target | | | (various low-level (various mounts and | remote-veritysetup.target |
| | services: udevd, fsck services...) | | | | | services: udevd, fsck services...) | | remote-fs.target
| | tmpfiles, random | | | remote-fs.target | | tmpfiles, random | | | /
| | seed, sysctl, ...) v | | | | | seed, sysctl, ...) v | | /
| | | local-fs.target | | _____________/ | | | local-fs.target | | /
| | | | | |/ | | | | | | /
\____|______|_______________ ______|___________/ | \____|______|_______________ ______|___________/ | /
\ / | \ / | /
v | v | /
sysinit.target | sysinit.target | /
| | | | /
______________________/|\_____________________ | ______________________/|\_____________________ | /
/ | | | \ | / | | | \ | /
| | | | | | | | | | | | /
v v | v | | v v | v | | /
(various (various | (various | | (various (various | (various | |/
timers...) paths...) | sockets...) | | timers...) paths...) | sockets...) | |
| | | | | | | | | | | |
v v | v | | v v | v | |

View File

@ -30,13 +30,14 @@
system-wide locale settings. It is read at early boot by system-wide locale settings. It is read at early boot by
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>The format of <filename>locale.conf</filename> is a newline-separated list of environment-like <para>The basic file format of <filename>locale.conf</filename> is
shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the a newline-separated list of environment-like shell-compatible
configuration from shell scripts, however, beyond mere variable assignments, no shell features are variable assignments, ignoring comments and empty lines.
supported, allowing applications to read the file without implementing a shell compatible execution It is possible to source the configuration
engine. See from shell scripts, however, beyond mere variable assignments, no
<citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a shell features are supported, allowing applications to read the
detailed description of the format.</para> file without implementing a shell compatible execution
engine.</para>
<para>Note that the kernel command line options <para>Note that the kernel command line options
<varname>locale.LANG=</varname>, <varname>locale.LANG=</varname>,
@ -58,7 +59,7 @@
<para>The locale settings configured in <para>The locale settings configured in
<filename>/etc/locale.conf</filename> are system-wide and are <filename>/etc/locale.conf</filename> are system-wide and are
inherited by every service or user, unless overridden or unset by inherited by every service or user, unless overridden or unset by
individual programs or users.</para> individual programs or individual users.</para>
<para>Depending on the operating system, other configuration files <para>Depending on the operating system, other configuration files
might be checked for locale configuration as well, however only as might be checked for locale configuration as well, however only as
@ -125,4 +126,5 @@ LC_MESSAGES=en_US.UTF-8</programlisting>
<citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>
</refentry> </refentry>

View File

@ -29,13 +29,13 @@
<para>The <filename>/etc/machine-info</filename> file contains <para>The <filename>/etc/machine-info</filename> file contains
machine metadata.</para> machine metadata.</para>
<para>The format of <filename>machine-info</filename> is a newline-separated list of environment-like <para>The basic file format of <filename>machine-info</filename>
shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the is a newline-separated list of environment-like shell-compatible
configuration from shell scripts, however, beyond mere variable assignments no shell features are variable assignments. It is possible to source the configuration
supported, allowing applications to read the file without implementing a shell compatible execution from shell scripts, however, beyond mere variable assignments no
engine. See shell features are supported, allowing applications to read the
<citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a file without implementing a shell compatible execution
detailed description of the format.</para> engine.</para>
<para><filename>/etc/machine-info</filename> contains metadata about the machine that is set by the user <para><filename>/etc/machine-info</filename> contains metadata about the machine that is set by the user
or administrator. The settings configured here have the highest precedence. When not set, appropriate or administrator. The settings configured here have the highest precedence. When not set, appropriate

View File

@ -35,7 +35,7 @@
<filename>/usr/lib/os-release</filename> files contain operating <filename>/usr/lib/os-release</filename> files contain operating
system identification data.</para> system identification data.</para>
<para>The format of <filename>os-release</filename> is a newline-separated list of <para>The basic file format of <filename>os-release</filename> is a newline-separated list of
environment-like shell-compatible variable assignments. It is possible to source the configuration from environment-like shell-compatible variable assignments. It is possible to source the configuration from
Bourne shell scripts, however, beyond mere variable assignments, no shell features are supported (this Bourne shell scripts, however, beyond mere variable assignments, no shell features are supported (this
means variable expansion is explicitly not supported), allowing applications to read the file without means variable expansion is explicitly not supported), allowing applications to read the file without
@ -44,8 +44,8 @@
09. (Assignments that do not include these special characters may be enclosed in quotes too, but this is 09. (Assignments that do not include these special characters may be enclosed in quotes too, but this is
optional.) Shell special characters ("$", quotes, backslash, backtick) must be escaped with backslashes, optional.) Shell special characters ("$", quotes, backslash, backtick) must be escaped with backslashes,
following shell style. All strings should be in UTF-8 encoding, and non-printable characters should not following shell style. All strings should be in UTF-8 encoding, and non-printable characters should not
be used. Concatenation of multiple individually quoted strings is not supported. Lines beginning with "#" be used. It is not supported to concatenate multiple individually quoted strings. Lines beginning with
are treated as comments. Blank lines are permitted and ignored.</para> "#" shall be ignored as comments. Blank lines are permitted and ignored.</para>
<para>The file <filename>/etc/os-release</filename> takes <para>The file <filename>/etc/os-release</filename> takes
precedence over <filename>/usr/lib/os-release</filename>. precedence over <filename>/usr/lib/os-release</filename>.

View File

@ -4554,10 +4554,10 @@ Bridge=bridge0</programlisting>
</example> </example>
<example> <example>
<title>Bridge port with VLAN forwarding</title> <title></title>
<programlisting> <programlisting>
# /etc/systemd/network/25-bridge-slave-interface-1.network # /etc/systemd/network/20-bridge-slave-interface-vlan.network
[Match] [Match]
Name=enp2s0 Name=enp2s0

View File

@ -32,13 +32,13 @@
You can safely mask this file if you want to avoid this kind of initialization. You can safely mask this file if you want to avoid this kind of initialization.
</para> </para>
<para>The format of <filename>vconsole.conf</filename> is a newline-separated list of environment-like <para>The basic file format of the
shell-compatible variable assignments, ignoring comments and empty lines. It is possible to source the <filename>vconsole.conf</filename> is a newline-separated list of
configuration from shell scripts, however, beyond mere variable assignments no shell features are environment-like shell-compatible variable assignments. It is
supported, allowing applications to read the file without implementing a shell compatible execution possible to source the configuration from shell scripts, however,
engine. See beyond mere variable assignments no shell features are supported,
<citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry> for a allowing applications to read the file without implementing a
detailed description of the format.</para> shell compatible execution engine.</para>
<para>Note that the kernel command line options <para>Note that the kernel command line options
<varname>vconsole.keymap=</varname>, <varname>vconsole.keymap=</varname>,