diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-06-09 13:56:56 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-06-15 10:47:57 -0700 |
| commit | 79c2379bf4c086f7ee4f348bd41e7b0bc5065b57 (patch) | |
| tree | 2a53e2e1ae9692ec77d2763e3d1c7cd7c8bde8cf /xenserver/openvswitch-xen.spec | |
| parent | cc86ea5a03a320476a89e9a13f9539c0146fac43 (diff) | |
| download | openvswitch-79c2379bf4c086f7ee4f348bd41e7b0bc5065b57.tar.gz | |
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>
Diffstat (limited to 'xenserver/openvswitch-xen.spec')
| -rw-r--r-- | xenserver/openvswitch-xen.spec | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 67dd26d29..debb2fd9a 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... " |