← Back to branch summary

~ubuntu-branches/ubuntu/vivid/openvswitch/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/xcp-interface-reconfigure.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-06-30 14:34:02 UTC
  • mfrom: (1.1.29)
  • Revision ID: package-import@ubuntu.com-20150630143402-4po65ymgth1ron0w
Tags: 2.3.2-0ubuntu0.15.04.1
https://launchpad.net/bugs/1470120
* New upstream point release (LP: #1470120):
  - d/p/*: Refresh all patches.
  - d/p/rules: Skip test 717 due to failure on powerpc - see
    http://pad.lv/1472202 for full details.
* d/tests/openflow.py: Use net.addLink to add links between switches and
  hosts to ensure that they get cleanup up after use, fixing autopkgtest
  failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/xcp-interface-reconfigure.patch
7
7
 
8
8
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
9
9
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
10
 
@@ -43,6 +43,10 @@ def delete_cacert():
 
10
@@ -44,6 +44,10 @@ def delete_cacert():
11
11
 def update(session, args):
12
12
     # Refresh bridge network UUIDs in case this host joined or left a pool.
13
 
     script = "/opt/xensource/libexec/interface-reconfigure"
 
13
     script = '/opt/xensource/libexec/interface-reconfigure'
14
14
+    # NOTE(jamespage): Override with distro xcp xapi locations
15
15
+    # if present
16
16
+    if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
17
17
+        script = '/usr/lib/xcp/lib/interface-reconfigure'
18
18
     try:
19
 
         retval = subprocess.call([script, "rewrite"])
 
19
         retval = subprocess.call([script, 'rewrite'])
20
20
         if retval != 0: