From: Ben Pfaff <blp@nicira.com>
Date: Wed, 9 Jun 2010 20:56:56 +0000 (-0700)
Subject: xenserver: Create network.conf before running interface-reconfigure.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c2379bf4c086f7ee4f348bd41e7b0bc5065b57;p=openvswitch

xenserver: Create network.conf before running interface-reconfigure.

XenServer 5.5.0 doesn't have /etc/xensource/network.conf, but the
interface-reconfigure that OVS installs issues an error and aborts if it
does not exist, so create network.conf before trying to run it.

CC: Paul Ingram <paul@nicira.com>
---

diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index 67dd26d2..debb2fd9 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -172,8 +172,15 @@ if test "$PRODUCT_VERSION" = "5.5.0"; then
     fi
     rm -f $XSS
     ln -s $RNU $XSS
+
+    # If /etc/xensource/network.conf doesn't exist (it was added in 5.6.0),
+    # then interface-reconfigure will be unhappy when we run it below.
+    if test ! -e /etc/xensource/network.conf; then
+        echo bridge > /etc/xensource/network.conf
+    fi
 fi
 
+
 if test ! -e /var/xapi/network.dbcache; then
     if test "$1" = 1; then
         printf "Creating xapi database cache...  "