From a4b2e516ffd0aa466f2d0182c89a91ce5d23d9a4 Mon Sep 17 00:00:00 2001 From: Andrew Evans Date: Thu, 10 Mar 2011 16:02:12 -0800 Subject: xenserver: Don't touch /etc/xensource/network.conf on upgrade. The post-install script for the openvswitch userspace package always sets the bridge type to 'vswitch'. If someone reconfigures XenServer to use the Linux bridge instead, then upgrades Open vSwitch, their system will revert to using Open vSwitch as the bridge. Reported-by: Michael Mao Bug #4825. --- xenserver/openvswitch-xen.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xenserver/openvswitch-xen.spec') diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index ab2134e2..450cd34b 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -246,10 +246,10 @@ for s in openvswitch openvswitch-xapi-update; do chkconfig $s on || printf "Could not enable $s init script." done -# Configure system to use Open vSwitch -echo vswitch > /etc/xensource/network.conf - if [ "$1" = "1" ]; then # $1 = 2 for upgrade + # Configure system to use Open vSwitch + echo vswitch > /etc/xensource/network.conf + printf "\nYou MUST reboot the server NOW to complete the change to\n" printf "Open vSwitch. Attempts to modify networking on the server\n" printf "or any hosted VM will fail until after the reboot and could\n" -- cgit v1.2.3