From ddf0a7cb04debe60825d11186e68cc6de6fd1dd2 Mon Sep 17 00:00:00 2001

From: Mark McLoughlin <markmc@redhat.com>

Date: Mon, 10 Aug 2009 11:16:37 +0100

Subject: [PATCH] Handle kernels with no ipv6 support

If the ipv6 kernel module is not loaded, then we get this when starting

a virtual network:

  libvir: Network Config error :

  cannot enable /proc/sys/net/ipv6/conf/virbr0/disable_ipv6:

  No such file or directory

If disable_ipv6 is not present, we should just merrily continue on our

way.

* src/network_driver.c: make networkDisableIPV6() not fail if the kernel

  has no ipv6 support

(cherry picked from commit f5a8f969dd92ec2744e1eec5d35288d5fbcded22)

Fedora-patch: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch

---

 src/network_driver.c |    6 ++++++

 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/network_driver.c b/src/network_driver.c

index eaea454..84910ab 100644

--- a/src/network_driver.c

+++ b/src/network_driver.c

@@ -801,6 +801,12 @@ static int networkDisableIPV6(virConnectPtr conn,

         goto cleanup;

     }

+    if (access(field, W_OK) < 0 && errno == ENOENT) {

+        VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge);

+        ret = 0;

+        goto cleanup;

+    }

+

     if (virFileWriteStr(field, "1") < 0) {

         virReportSystemError(conn, errno,

                              _("cannot enable %s"), field);

-- 

1.6.2.5