From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CE931396D0 for ; Sun, 8 Oct 2017 17:11:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D77C2BC037; Sun, 8 Oct 2017 17:11:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3A842BC037 for ; Sun, 8 Oct 2017 17:11:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62CE233BF44 for ; Sun, 8 Oct 2017 17:11:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A443C83F7 for ; Sun, 8 Oct 2017 17:11:10 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1507482577.56ed29f119c41b339fba8eaea6044226355dbe36.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch sys-apps/systemd/systemd-235.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 56ed29f119c41b339fba8eaea6044226355dbe36 X-VCS-Branch: master Date: Sun, 8 Oct 2017 17:11:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 199670c3-bdcc-4867-a666-2017f4c426ee X-Archives-Hash: b26bbf52814e76f3528d501ae67cfd14 commit: 56ed29f119c41b339fba8eaea6044226355dbe36 Author: Mike Gilbert gentoo org> AuthorDate: Sun Oct 8 17:08:39 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Oct 8 17:09:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ed29f1 sys-apps/systemd: networkd startup fix Package-Manager: Portage-2.3.10_p4, Repoman-2.3.3_p52 ...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 47 ++++++++++++++++++++++ sys-apps/systemd/systemd-235.ebuild | 1 + 2 files changed, 48 insertions(+) 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 00000000000..99e7342ffb2 --- /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 +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 6647d41a680..68265aa9401 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