summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-11-29 05:32:33 +0900
committerGitHub <noreply@github.com>2020-11-29 05:32:33 +0900
commitbb2d0a24f39ac391a603b3bea7e88df05ea554cc (patch)
tree6611326e7907c0741f9e75d7f3fa081be6a2a856
parenteee582e7951fa8e328d1fcdfcff940254070ccba (diff)
parent78cafcbc7ec7eb19d40a07dfa75ad562f7ded643 (diff)
downloadsystemd-bb2d0a24f39ac391a603b3bea7e88df05ea554cc.tar.gz
Merge pull request #17761 from keszybz/documentation-followups
Two tiny fixlets
-rw-r--r--NEWS4
-rw-r--r--src/network/test-networkd-conf.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 33048e3f19..49e19cec22 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ CHANGES WITH 247:
programs that monitor or enumerate devices with libudev or sd-device,
or otherwise process uevents. Please note that this incompatibility
is not fault of systemd or udev, but caused by an incompatible kernel
- change that happened back in Linux 4.12, but is becoming more and
+ change that happened back in Linux 4.14, but is becoming more and
more visible as the new uevents are generated by more kernel drivers.
To minimize issues resulting from this kernel change (but not avoid
@@ -45,7 +45,7 @@ CHANGES WITH 247:
new functions to enumerate these 'current' tags, in addition to the
existing APIs that now enumerate the 'sticky' ones.
- To properly handle "bind"/"unbind" on Linux 4.12 and newer it is
+ To properly handle "bind"/"unbind" on Linux 4.14 and newer it is
essential that all udev rules files and applications are updated to
handle the new events. Specifically:
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
index d068a4644d..1142f10b10 100644
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -221,7 +221,7 @@ static void test_config_parse_match_ifnames(void) {
assert_se(config_parse_match_ifnames("network", "filename", 1, "section", 1, "Name", 0, "!baz", &names, NULL) == 0);
assert_se(config_parse_match_ifnames("network", "filename", 1, "section", 1, "Name", 0, "aaa bbb ccc", &names, NULL) == 0);
- strv_equal(names, STRV_MAKE("!hoge", "!hogehoge", "!foo", "!baz", "aaa", "bbb", "ccc"));
+ assert_se(strv_equal(names, STRV_MAKE("!hoge", "!hogehoge", "!foo", "!baz", "aaa", "bbb", "ccc")));
}
static void test_config_parse_match_strv(void) {