Merge pull request #23916 from keszybz/assorted-patches
Assorted patches
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user