From: Ben Pfaff <blp@nicira.com>
Date: Wed, 9 Jun 2010 20:56:06 +0000 (-0700)
Subject: xenserver: Delete network.conf on package removal on XenServer 5.5.0.
X-Git-Tag: v1.1.0pre1~286
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4959755dc8512f6a0b19ce13138d6d001629904d;p=sliver-openvswitch.git

xenserver: Delete network.conf on package removal on XenServer 5.5.0.

The previous commit "xenserver: Create network.conf before running
interface-reconfigure" fixed a problem that was not noticed earlier only
because we had not tested very often on pristine XenServer 5.5.0 systems,
instead mostly on systems that had had Open vSwitch installed before and
thus already had a network.conf file.  This commit should help to avoiding
future regressions in this area, by removing network.conf when the
openvswitch package is removed on XenServer 5.5.0.
---

diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index debb2fd9a..d2433f986 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -345,8 +345,13 @@ if [ "$1" = "0" ]; then     # $1 = 1 for upgrade
     rm -f /etc/openvswitch/vswitchd.cacert
     rm -f /var/xapi/network.dbcache
 
-    # Configure system to use bridge
-    echo bridge > /etc/xensource/network.conf
+    if test "$PRODUCT_VERSION" != "5.5.0"; then
+        # Configure system to use bridge
+        echo bridge > /etc/xensource/network.conf
+    else
+        # Get rid of network.conf entirely, to make the system pristine.
+        rm -f /etc/xensource/network.conf
+    fi
 
     printf "\nYou MUST reboot the server now to complete the change to\n"
     printf "standard Xen networking.  Attempts to modify networking on the\n"