[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/

[Mike Gilbert]

commit:     f9b7cdf12d269a4eaf0977cea94f9559288da082
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 18:38:37 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 18:39:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b7cdf1

sys-apps/systemd: update patch

Package-Manager: Portage-2.3.11_p4, Repoman-2.3.3_p62

 ...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 53 ++++++++++++----------
 1 file changed, 28 insertions(+), 25 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
index 99e7342ffb2..9c11106f605 100644
--- 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
@@ -1,14 +1,14 @@
-From 3bd3ac67477ea319cc169dbd1c377912cf8ff198 Mon Sep 17 00:00:00 2001
-From: Susant Sahani <susant@××××××.com>
-Date: Sun, 8 Oct 2017 21:51:35 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in
- kernel.
+From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
+From: Susant Sahani <145210+ssahani@××××××××××××××××××××.com>
+Date: Wed, 18 Oct 2017 11:55:57 +0530
+Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
+ (#7030)
 
-if FIB Rules in not supported by the kernel then networkd fails to
+If FIB Rules are 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
@@ -22,26 +22,29 @@ Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited,
 
 Fixes #7027
 ---
- src/network/networkd.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ src/network/networkd-manager.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
-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[]) {
-         }
+diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
+index 71445d5dd..200d0f622 100644
+--- a/src/network/networkd-manager.c
++++ b/src/network/networkd-manager.c
+@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
+                 return r;
  
-         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 = sd_netlink_call(m->rtnl, req, 0, &reply);
+-        if (r < 0)
++        if (r < 0) {
++                if (r == -EOPNOTSUPP) {
++                        log_debug("FIB Rules are not supported by the kernel. Ignoring.");
++                        return 0;
++                }
++
+                 return r;
++        }
  
-         r = manager_start(m);
-         if (r < 0) {
+         for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
+                 int k;
 -- 
-2.14.2
+2.15.0.rc1