diff options
author | Mike Gilbert <floppym@gentoo.org> | 2017-10-08 13:08:39 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2017-10-08 13:09:37 -0400 |
commit | 56ed29f119c41b339fba8eaea6044226355dbe36 (patch) | |
tree | b32b1876adc55572881edb58a12dfb6d2bee41ce /sys-apps | |
parent | dev-python/pyopenssl: version bump to 17.3.0 (diff) | |
download | gentoo-56ed29f119c41b339fba8eaea6044226355dbe36.tar.gz gentoo-56ed29f119c41b339fba8eaea6044226355dbe36.tar.bz2 gentoo-56ed29f119c41b339fba8eaea6044226355dbe36.zip |
sys-apps/systemd: networkd startup fix
Package-Manager: Portage-2.3.10_p4, Repoman-2.3.3_p52
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 47 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-235.ebuild | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch new file mode 100644 index 000000000000..99e7342ffb23 --- /dev/null +++ b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch @@ -0,0 +1,47 @@ +From 3bd3ac67477ea319cc169dbd1c377912cf8ff198 Mon Sep 17 00:00:00 2001 +From: Susant Sahani <susant@redhat.com> +Date: Sun, 8 Oct 2017 21:51:35 +0530 +Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in + kernel. + +if FIB Rules in not supported by the kernel then networkd fails to +start as it retuns error=-EOPNOTSUPP. +In this case just ignore and let start networkd. + +```` +sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28 +recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48 +recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48 +``` + +``` +Oct 08 10:22:24 naomi systemd[1]: Starting Network Service... +Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: Operation not supported +Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited, code=exited, status=1/FAILURE +``` + +Fixes #7027 +--- + src/network/networkd.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/network/networkd.c b/src/network/networkd.c +index d5ba6893e..7f7223c0c 100644 +--- a/src/network/networkd.c ++++ b/src/network/networkd.c +@@ -133,10 +133,8 @@ int main(int argc, char *argv[]) { + } + + r = manager_rtnl_enumerate_rules(m); +- if (r < 0) { +- log_error_errno(r, "Could not enumerate rules: %m"); +- goto out; +- } ++ if (r < 0) ++ log_warning_errno(r, "Could not enumerate rules: %m"); + + r = manager_start(m); + if (r < 0) { +-- +2.14.2 + diff --git a/sys-apps/systemd/systemd-235.ebuild b/sys-apps/systemd/systemd-235.ebuild index 6647d41a6804..68265aa94019 100644 --- a/sys-apps/systemd/systemd-235.ebuild +++ b/sys-apps/systemd/systemd-235.ebuild @@ -149,6 +149,7 @@ src_unpack() { src_prepare() { local PATCHES=( "${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch + "${FILESDIR}"/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch ) if ! use vanilla; then |