From 4959755dc8512f6a0b19ce13138d6d001629904d Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 9 Jun 2010 13:56:06 -0700 Subject: [PATCH] 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. --- xenserver/openvswitch-xen.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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" -- 2.43.0