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