Compare commits

..

No commits in common. "8db8f99eb93682658dad5466eac8890c1cf3d80a" and "a51a3247e5bb36e375eb750b78fabcdff8601378" have entirely different histories.

3 changed files with 8 additions and 10 deletions

View File

@ -268,8 +268,7 @@
independently, for example with <citerefentry independently, for example with <citerefentry
project='man-pages'><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. If project='man-pages'><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. If
non-existent groups that are listed there are ignored. This option may be used more than once, in non-existent groups that are listed there are ignored. This option may be used more than once, in
which case all specified group lists are combined. If the user is currently a member of a group which case all specified group lists are combined.</para></listitem>
which is not listed, the user will be removed from the group.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -29,15 +29,14 @@
<refsect1> <refsect1>
<title>Description</title> <title>Description</title>
<para><filename>systemd-modules-load.service</filename> is an early boot service that loads kernel <para><filename>systemd-modules-load.service</filename> is an
modules. It reads static configuration from files in <filename>/usr</filename> and early boot service that loads kernel modules based on static
<filename>/etc</filename>, but also runtime configuration from <filename>/run</filename> and the kernel configuration.</para>
command line (see below).</para>
<para>See <para>See
<citerefentry><refentrytitle>modules-load.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> for <citerefentry><refentrytitle>modules-load.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
information about the configuration format of this service and paths where configuration files can be for information about the configuration of this service.</para>
created.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

View File

@ -116,7 +116,7 @@ static int link_push_uplink_to_dhcp_server(
case SD_DHCP_LEASE_LPR: case SD_DHCP_LEASE_LPR:
/* For the other server types we currently do not allow local configuration of server data, /* For the other server types we currently do not allow local configuration of server data,
* since there are typically no local consumers of the data. */ * since there are typically no local consumers of the data. */
break; ;
default: default:
assert_not_reached("Unexpected server type"); assert_not_reached("Unexpected server type");