1
0
mirror of https://github.com/systemd/systemd synced 2026-03-13 16:44:48 +01:00

Compare commits

..

5 Commits

Author SHA1 Message Date
Yu Watanabe
0e27527170 network: update comment and log message
After 4b30f2e135ee84041bb597edca7225858f4ef4fb, reading stable_secret
sysctl property fails with -ENOMEM, instead of -EIO.
This is due to read_full_virtual_file() uses read() as the backend while
read_one_line_file() uses fgetc(). And each functions return different
error on fails.

Anyway, the failure is harmless here. So, the log message and comment is
updated.

Closes one of the issues in #19410.
2021-04-26 10:08:41 +01:00
Luca Boccassi
bb35478bf9
Merge pull request #19421 from yuwata/fix-typo
core, network: Fix typo
2021-04-26 10:08:07 +01:00
Yu Watanabe
25054e1bfb network: add missing sections
Follow-up for 4e26a5baa0045c8bbb899f0c72f07ac630692bd3.

Fixes one of issues in #19410.
2021-04-26 10:07:52 +02:00
Yu Watanabe
8170992a79 core/service: fix typo
Follow-up for bbe19f68846bb3cd5fcf3e4f612268064df53b53.
2021-04-26 09:20:30 +09:00
Yu Watanabe
cead8ed66e network: fix typo
Follow-up for 4b409e855b18c263b0526c826fdca16215a4cf2e.
2021-04-26 09:19:41 +09:00
4 changed files with 7 additions and 4 deletions

View File

@ -3480,7 +3480,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
if (control_pid_good(s) <= 0)
service_enter_stop(s, f);
/* Otherwise need to wait untill the operation is done. */
/* Otherwise need to wait until the operation is done. */
break;
case SERVICE_STOP:

View File

@ -18,6 +18,8 @@ int manager_parse_config_file(Manager *m) {
PKGSYSCONFDIR "/networkd.conf",
CONF_PATHS_NULSTR("systemd/networkd.conf.d"),
"Network\0"
"DHCPv4\0"
"DHCPv6\0"
"DHCP\0",
config_item_perf_lookup, networkd_gperf_lookup,
CONFIG_PARSE_WARN,

View File

@ -888,7 +888,7 @@ static int dhcp6_pd_prefix_add(Link *link, const union in_addr_union *prefix, ui
"DHCP6: received PD Prefix %s%s",
strna(buf),
prefixlen > 64 ? " with prefix length > 64, ignoring." :
prefixlen < 48 ? " with prefix lenght < 48, looks unusual.": "");
prefixlen < 48 ? " with prefix length < 48, looks unusual.": "");
/* Store PD prefix even if prefixlen > 64, not to make logged at warning level so frequently. */
r = set_ensure_put(&link->dhcp6_pd_prefixes, &in_addr_prefix_hash_ops_free, p);

View File

@ -1327,8 +1327,9 @@ static int link_configure_addrgen_mode(Link *link) {
r = sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL);
if (r < 0) {
/* The file may not exist. And even if it exists, when stable_secret is unset,
* reading the file fails with EIO. */
log_link_debug_errno(link, r, "Failed to read sysctl property stable_secret: %m");
* reading the file fails with ENOMEM when read_full_virtual_file(), which uses
* read() as the backend, and EIO when read_one_line_file() which uses fgetc(). */
log_link_debug_errno(link, r, "Failed to read sysctl property stable_secret, ignoring: %m");
ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
} else