[systemd-commits] src/network

[Lennart Poettering]

 src/network/networkd-link.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit fe0272999c8ef7961a446a7743f824ba4cfe0918
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri May 15 12:20:36 2015 +0200

    networkd: don't try to turn on ipv6 forwarding if kernel lacks IPv6 support
    
    http://lists.freedesktop.org/archives/systemd-devel/2015-May/031598.html

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 1c59e15..8b0de1f 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "virt.h"
 #include "fileio.h"
+#include "socket-util.h"
 #include "bus-util.h"
 #include "udev-util.h"
 #include "network-internal.h"
@@ -1489,6 +1490,10 @@ static int link_set_ipv6_forward(Link *link) {
         const char *p = NULL;
         int r;
 
+        /* Make this a NOP if IPv6 is not available */
+        if (!socket_ipv6_is_supported())
+                return 0;
+
         p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/forwarding");
         r = write_string_file_no_create(p, one_zero(link_ipv6_forward_enabled(link)));
         if (r < 0)