1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-10 00:58:20 +03:00

Merge pull request #23916 from keszybz/assorted-patches

Assorted patches
This commit is contained in:
Yu Watanabe 2022-07-06 14:15:50 +09:00 committed by GitHub
commit 917c6bb4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 6 additions and 6 deletions

View File

@ -114,9 +114,9 @@
<para>Supported glob wildcard patterns are <literal>?</literal>, <literal>*</literal>, and
<literal>[…]</literal> (including ranges). Note that these patterns use the same syntax as
<citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>, but do not
support all features. In particular, set negation and named character classes are not supported. The
matching is done case-insensitively on the entry ID (as shown by <command>bootctl
<citerefentry project='man-pages'><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
but do not support all features. In particular, set negation and named character classes are not
supported. The matching is done case-insensitively on the entry ID (as shown by <command>bootctl
list</command>).</para></listitem>
</varlistentry>

View File

@ -527,7 +527,7 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
r = ndisc_request_route(TAKE_PTR(route), link, rt);
if (r < 0)
return log_link_error_errno(link, r, "Could not request prefix route: %m");;
return log_link_error_errno(link, r, "Could not request prefix route: %m");
return 0;
}

View File

@ -256,7 +256,7 @@ int link_set_sysctl(Link *link) {
r = link_set_ipv6_forward(link);
if (r < 0)
log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m");;
log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m");
r = link_set_ipv6_privacy_extensions(link);
if (r < 0)

View File

@ -2126,7 +2126,7 @@ static int udev_rule_apply_token_to_event(
if (r == -ENOMEM)
return log_oom();
if (r < 0)
return log_rule_error_errno(dev, rules, r, "Failed to store SECLABEL{%s}='%s': %m", name, label);;
return log_rule_error_errno(dev, rules, r, "Failed to store SECLABEL{%s}='%s': %m", name, label);
log_rule_debug(dev, rules, "SECLABEL{%s}='%s'", name, label);